From f73200e4d19d2e1bf5c8dcafada32261a36f51e4 Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Fri, 1 Dec 2017 12:50:14 -0500
Subject: [PATCH] readiness: test apache APIs provide http response to request

This PS updates the readiness probes to test for an http response
to requests.

Change-Id: If102b4f247cc8524ceb02e6b2d22cd854a8fb9d2
---
 horizon/templates/deployment.yaml        | 6 +++++-
 keystone/templates/deployment-api.yaml   | 6 +++++-
 nova/templates/deployment-placement.yaml | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
index a33100f05f..17777d23ef 100644
--- a/horizon/templates/deployment.yaml
+++ b/horizon/templates/deployment.yaml
@@ -66,8 +66,12 @@ spec:
           ports:
             - containerPort: {{ .Values.network.port }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: HTTP
+              path: /
               port: {{ .Values.network.port }}
+            initialDelaySeconds: 15
+            periodSeconds: 10
           volumeMounts:
             - name: static-horizon
               mountPath: /var/www/html/
diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml
index 312e0585c3..d868924909 100644
--- a/keystone/templates/deployment-api.yaml
+++ b/keystone/templates/deployment-api.yaml
@@ -67,8 +67,12 @@ spec:
             - name: api-admin
               containerPort: {{ .Values.network.admin.port }}
           readinessProbe:
-            tcpSocket:
+            httpGet:
+              scheme: HTTP
+              path: /
               port: {{ .Values.network.api.port }}
+            initialDelaySeconds: 15
+            periodSeconds: 10
           volumeMounts:
           - name: etckeystone
             mountPath: /etc/keystone
diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml
index a1218bebe5..0ad4c4e6f1 100644
--- a/nova/templates/deployment-placement.yaml
+++ b/nova/templates/deployment-placement.yaml
@@ -64,8 +64,11 @@ spec:
           ports:
             - containerPort: {{ .Values.network.placement.port }}
           readinessProbe:
+            #NOTE(portdirect): use tcpSocket check as HTTP will return 401
             tcpSocket:
               port: {{ .Values.network.placement.port }}
+            initialDelaySeconds: 15
+            periodSeconds: 10
           volumeMounts:
             - name: wsgi-nova
               mountPath: /var/www/cgi-bin/nova