openstack/openstack-helm
Code Issues Proposed changes

Cleanup: fix neutron db-job manifest and rally pod permissions.

Browse Source 
This PS removes the duplicate command key in the Neutron DB-Job
manifest and corrects the rally pod permisions.

Change-Id: I97b9a9ab54609696ac763f3a319f6df78fe5d73c
This commit is contained in:
Pete Birley 2017-07-06 14:56:09 -05:00
parent 568ca0aa62
commit fecac47b5a
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/pod-rally-test.yaml
View File

@ -39,7 +39,6 @@ spec:
- name: RALLY_ENV_NAME - name: RALLY_ENV_NAME
value: {{.Release.Name}} value: {{.Release.Name}}
command: command:
- bash
- /tmp/rally-test.sh - /tmp/rally-test.sh
volumeMounts: volumeMounts:
- name: cinder-etc - name: cinder-etc
@ -60,6 +59,7 @@ spec:
- name: cinder-bin - name: cinder-bin
configMap: configMap:
name: cinder-bin name: cinder-bin
defaultMode: 0555
- name: rally-db - name: rally-db
emptyDir: {} emptyDir: {}
{{- if $mounts_cinder_tests.volumes }}{{ toYaml $mounts_cinder_tests.volumes | indent 4 }}{{ end }} {{- if $mounts_cinder_tests.volumes }}{{ toYaml $mounts_cinder_tests.volumes | indent 4 }}{{ end }}

2
glance/templates/pod-rally-test.yaml
View File

@ -39,7 +39,6 @@ spec:
- name: RALLY_ENV_NAME - name: RALLY_ENV_NAME
value: {{.Release.Name}} value: {{.Release.Name}}
command: command:
- bash
- /tmp/rally-test.sh - /tmp/rally-test.sh
volumeMounts: volumeMounts:
- name: glance-etc - name: glance-etc
@ -60,6 +59,7 @@ spec:
- name: glance-bin - name: glance-bin
configMap: configMap:
name: glance-bin name: glance-bin
defaultMode: 0555
- name: rally-db - name: rally-db
emptyDir: {} emptyDir: {}
{{- if $mounts_glance_tests.volumes }}{{ toYaml $mounts_glance_tests.volumes | indent 4 }}{{ end }} {{- if $mounts_glance_tests.volumes }}{{ toYaml $mounts_glance_tests.volumes | indent 4 }}{{ end }}

8
neutron/templates/job-db-sync.yaml
View File

@ -32,14 +32,6 @@ spec:
image: {{ .Values.images.db_sync }} image: {{ .Values.images.db_sync }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:
- neutron-db-manage
- --config-file
- /etc/neutron/neutron.conf
- --config-file
- /etc/neutron/plugins/ml2/ml2_conf.ini
- upgrade
- head
{{- if .Values.resources.enabled }} {{- if .Values.resources.enabled }}
resources: resources:
limits: limits: