Rally: add missing manifest conditionals

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

Change-Id: If9b028c40f5cf13bf72c4627f59d3699dc0c44e8
This commit is contained in:
portdirect 2018-02-07 10:26:26 -05:00
parent 319fd2cbec
commit b4d513c3bd
4 changed files with 26 additions and 18 deletions

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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