Merge "Move keystone config files to manifests"

keystone/templates/deployment.yaml

@@ -75,6 +75,44 @@ spec:
             tcpSocket:
               port: {{ .Values.network.api.port }}
           volumeMounts:
-{{ toYaml $mounts_keystone_api.volumeMounts | indent 12 }}
+          - name: etckeystone
+            mountPath: /etc/keystone
+          - name: keystone-etc
+            mountPath: /etc/keystone/keystone.conf
+            subPath: keystone.conf
+            readOnly: true
+          - name: keystone-etc
+            mountPath: /etc/keystone/keystone-paste.ini
+            subPath: keystone-paste.ini
+            readOnly: true
+          - name: keystone-etc
+            mountPath: /etc/keystone/policy.json
+            subPath: policy.json
+            readOnly: true
+          - name: keystone-etc
+            mountPath: /etc/keystone/sso_callback_template.html
+            subPath: sso_callback_template.html
+            readOnly: true
+          - name: keystone-etc
+            mountPath: /etc/apache2/conf-enabled/wsgi-keystone.conf
+            subPath: wsgi-keystone.conf
+            readOnly: true
+          - name: keystone-etc
+            mountPath: /etc/apache2/mods-available/mpm_event.conf
+            subPath: mpm_event.conf
+            readOnly: true
+          - name: keystone-bin
+            mountPath: /tmp/start.sh
+            subPath: start.sh
+            readOnly: true
+{{ if $mounts_keystone_api.volumeMounts }}{{ toYaml $mounts_keystone_api.volumeMounts | indent 10 }}{{ end }}
       volumes:
-{{ toYaml $mounts_keystone_api.volumes | indent 8 }}
+      - name: etckeystone
+        emptyDir: {}
+      - name: keystone-etc
+        configMap:
+          name: keystone-etc
+      - name: keystone-bin
+        configMap:
+          name: keystone-bin
+{{ if $mounts_keystone_api.volumes }}{{ toYaml $mounts_keystone_api.volumes | indent 6 }}{{ end }}

keystone/templates/job-db-init.yaml

@@ -61,6 +61,24 @@ spec:
             - python
             - /tmp/db-init.py
           volumeMounts:
-{{ toYaml $mounts_keystone_db_init.volumeMounts | indent 12 }}
+          - name: etckeystone
+            mountPath: /etc/keystone
+          - name: keystone-etc
+            mountPath: /etc/keystone/keystone.conf
+            subPath: keystone.conf
+            readOnly: true
+          - name: keystone-bin
+            mountPath: /tmp/db-init.py
+            subPath: db-init.py
+            readOnly: true
+{{ if $mounts_keystone_db_init.volumeMounts }}{{ toYaml $mounts_keystone_db_init.volumeMounts | indent 10 }}{{ end }}
       volumes:
-{{ toYaml $mounts_keystone_db_init.volumes | indent 8 }}
+      - name: etckeystone
+        emptyDir: {}
+      - name: keystone-etc
+        configMap:
+          name: keystone-etc
+      - name: keystone-bin
+        configMap:
+          name: keystone-bin
+{{ if $mounts_keystone_db_init.volumes }}{{ toYaml $mounts_keystone_db_init.volumes | indent 6 }}{{ end }}

keystone/templates/job-db-sync.yaml

@@ -48,6 +48,24 @@ spec:
             - bash
             - /tmp/db-sync.sh
           volumeMounts:
-{{ toYaml $mounts_keystone_db_sync.volumeMounts | indent 12 }}
+          - name: etckeystone
+            mountPath: /etc/keystone
+          - name: keystone-etc
+            mountPath: /etc/keystone/keystone.conf
+            subPath: keystone.conf
+            readOnly: true
+          - name: keystone-bin
+            mountPath: /tmp/db-sync.sh
+            subPath: db-sync.sh
+            readOnly: true
+{{ if $mounts_keystone_db_sync.volumeMounts }}{{ toYaml $mounts_keystone_db_sync.volumeMounts | indent 10 }}{{ end }}
       volumes:
-{{ toYaml $mounts_keystone_db_sync.volumes | indent 8 }}
+      - name: etckeystone
+        emptyDir: {}
+      - name: keystone-etc
+        configMap:
+          name: keystone-etc
+      - name: keystone-bin
+        configMap:
+          name: keystone-bin
+{{ if $mounts_keystone_db_sync.volumes }}{{ toYaml $mounts_keystone_db_sync.volumes | indent 6 }}{{ end }}

keystone/values.yaml

@@ -107,92 +107,12 @@ mounts:
   keystone_db_init:
     init_container: null
     keystone_db_init:
-      volumes:
-      - name: empty
-        emptyDir: {}
-      - name: keystone-etc
-        configMap:
-          name: keystone-etc
-      - name: keystone-bin
-        configMap:
-          name: keystone-bin
-      volumeMounts:
-      - name: empty
-        mountPath: /etc/keystone
-      - name: keystone-etc
-        mountPath: /etc/keystone/keystone.conf
-        subPath: keystone.conf
-        readOnly: true
-      - name: keystone-bin
-        mountPath: /tmp/db-init.py
-        subPath: db-init.py
-        readOnly: true
   keystone_db_sync:
     init_container: null
     keystone_db_sync:
-      volumes:
-      - name: empty
-        emptyDir: {}
-      - name: keystone-etc
-        configMap:
-          name: keystone-etc
-      - name: keystone-bin
-        configMap:
-          name: keystone-bin
-      volumeMounts:
-      - name: empty
-        mountPath: /etc/keystone
-      - name: keystone-etc
-        mountPath: /etc/keystone/keystone.conf
-        subPath: keystone.conf
-        readOnly: true
-      - name: keystone-bin
-        mountPath: /tmp/db-sync.sh
-        subPath: db-sync.sh
-        readOnly: true
   keystone_api:
     init_container: null
     keystone_api:
-      volumes:
-      - name: empty
-        emptyDir: {}
-      - name: keystone-etc
-        configMap:
-          name: keystone-etc
-      - name: keystone-bin
-        configMap:
-          name: keystone-bin
-      volumeMounts:
-      - name: empty
-        mountPath: /etc/keystone
-      - name: keystone-etc
-        mountPath: /etc/keystone/keystone.conf
-        subPath: keystone.conf
-        readOnly: true
-      - name: keystone-etc
-        mountPath: /etc/keystone/keystone-paste.ini
-        subPath: keystone-paste.ini
-        readOnly: true
-      - name: keystone-etc
-        mountPath: /etc/keystone/policy.json
-        subPath: policy.json
-        readOnly: true
-      - name: keystone-etc
-        mountPath: /etc/keystone/sso_callback_template.html
-        subPath: sso_callback_template.html
-        readOnly: true
-      - name: keystone-etc
-        mountPath: /etc/apache2/conf-enabled/wsgi-keystone.conf
-        subPath: wsgi-keystone.conf
-        readOnly: true
-      - name: keystone-etc
-        mountPath: /etc/apache2/mods-available/mpm_event.conf
-        subPath: mpm_event.conf
-        readOnly: true
-      - name: keystone-bin
-        mountPath: /tmp/start.sh
-        subPath: start.sh
-        readOnly: true
 
 conf:
   paste: