From b4d513c3bd84aaf5aca26607105a1a14bf3cb8aa Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Wed, 7 Feb 2018 10:26:26 -0500
Subject: [PATCH] Rally: add missing manifest conditionals

This PS add consditionals to the keystone job manifests, which
were previously missing.

Change-Id: If9b028c40f5cf13bf72c4627f59d3699dc0c44e8
---
 rally/templates/job-ks-endpoints.yaml |  2 ++
 rally/templates/job-ks-service.yaml   |  2 ++
 rally/templates/job-ks-user.yaml      |  2 ++
 rally/values.yaml                     | 38 ++++++++++++++-------------
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/rally/templates/job-ks-endpoints.yaml b/rally/templates/job-ks-endpoints.yaml
index c98c89a772..e5ea534207 100644
--- a/rally/templates/job-ks-endpoints.yaml
+++ b/rally/templates/job-ks-endpoints.yaml
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- if .Values.manifests.job_ks_endpoints }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.ks_endpoints }}
 
@@ -69,3 +70,4 @@ spec:
           configMap:
             name: rally-bin
             defaultMode: 0555
+{{- end }}
diff --git a/rally/templates/job-ks-service.yaml b/rally/templates/job-ks-service.yaml
index 281c025d84..ae21606e68 100644
--- a/rally/templates/job-ks-service.yaml
+++ b/rally/templates/job-ks-service.yaml
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- if .Values.manifests.job_ks_service }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.ks_service }}
 
@@ -63,3 +64,4 @@ spec:
           configMap:
             name: rally-bin
             defaultMode: 0555
+{{- end }}
diff --git a/rally/templates/job-ks-user.yaml b/rally/templates/job-ks-user.yaml
index ee3029d5f9..ddba1e92c2 100644
--- a/rally/templates/job-ks-user.yaml
+++ b/rally/templates/job-ks-user.yaml
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- if .Values.manifests.job_ks_user }}
 {{- $nodeSelector := dict .Values.labels.job.node_selector_key .Values.labels.job.node_selector_value }}
 {{- $dependencies := .Values.dependencies.ks_user }}
 {{- $ksUserJob := dict "envAll" . "nodeSelector" $nodeSelector "dependencies" $dependencies "configMapBin" "rally-bin" "serviceName" "rally" "serviceUser" "rally" }}
 {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
+{{- end }}
diff --git a/rally/values.yaml b/rally/values.yaml
index 84b6d5732f..2fcb67326e 100644
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -267,24 +267,6 @@ pvc:
     storage: 2Gi
   storage_class: general
 
-manifests:
-  configmap_bin: true
-  configmap_etc: true
-  configmap_tasks: true
-  configmap_test_templates: true
-  ingress_api: true
-  job_bootstrap: true
-  job_db_init: true
-  job_manage_db: true
-  job_run_task: true
-  pdb_api: true
-  pvc_rally: true
-  secret_db: true
-  secret_keystone: true
-  service_ingress_api: true
-  service: true
-
-
 conf:
   paste:
     override:
@@ -12516,3 +12498,23 @@ conf:
             concurrency: 3
             times: 6
             type: constant
+
+manifests:
+  configmap_bin: true
+  configmap_etc: true
+  configmap_tasks: true
+  configmap_test_templates: true
+  ingress_api: true
+  job_bootstrap: true
+  job_db_init: true
+  job_ks_endpoints: true
+  job_ks_service: true
+  job_ks_user: true
+  job_manage_db: true
+  job_run_task: true
+  pdb_api: true
+  pvc_rally: true
+  secret_db: true
+  secret_keystone: true
+  service_ingress_api: true
+  service: true