From fecac47b5a98cf60f829640de79d87955ff9e9db Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 6 Jul 2017 14:56:09 -0500
Subject: [PATCH] Cleanup: fix neutron db-job manifest and rally pod
 permissions.

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

Change-Id: I97b9a9ab54609696ac763f3a319f6df78fe5d73c
---
 cinder/templates/pod-rally-test.yaml | 2 +-
 glance/templates/pod-rally-test.yaml | 2 +-
 neutron/templates/job-db-sync.yaml   | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml
index 3ba86e15..ac0989cd 100644
--- a/cinder/templates/pod-rally-test.yaml
+++ b/cinder/templates/pod-rally-test.yaml
@@ -39,7 +39,6 @@ spec:
         - name: RALLY_ENV_NAME
           value: {{.Release.Name}}
       command:
-        - bash
         - /tmp/rally-test.sh
       volumeMounts:
         - name: cinder-etc
@@ -60,6 +59,7 @@ spec:
     - name: cinder-bin
       configMap:
         name: cinder-bin
+        defaultMode: 0555
     - name: rally-db
       emptyDir: {}
 {{- if $mounts_cinder_tests.volumes }}{{ toYaml $mounts_cinder_tests.volumes | indent 4 }}{{ end }}
diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml
index ee7c6ca6..ce344aaf 100644
--- a/glance/templates/pod-rally-test.yaml
+++ b/glance/templates/pod-rally-test.yaml
@@ -39,7 +39,6 @@ spec:
         - name: RALLY_ENV_NAME
           value: {{.Release.Name}}
       command:
-        - bash
         - /tmp/rally-test.sh
       volumeMounts:
         - name: glance-etc
@@ -60,6 +59,7 @@ spec:
     - name: glance-bin
       configMap:
         name: glance-bin
+        defaultMode: 0555
     - name: rally-db
       emptyDir: {}
 {{- if $mounts_glance_tests.volumes }}{{ toYaml $mounts_glance_tests.volumes | indent 4 }}{{ end }}
diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml
index a7d57ff3..7ea65a69 100644
--- a/neutron/templates/job-db-sync.yaml
+++ b/neutron/templates/job-db-sync.yaml
@@ -32,14 +32,6 @@ spec:
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ 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 }}
           resources:
             limits: