Merge pull request #12 from PiotrProkop/keystone-fix

Keystone fix

keystone/templates/_helpers.tpl

@@ -0,0 +1,3 @@
+{{- define "joinListWithColon" -}}
+{{ range $k, $v := . }}{{ if $k }},{{ end }}{{ $v }}{{ end }}
+{{- end -}}

keystone/templates/db-sync.yaml

@@ -17,11 +17,11 @@ spec:
               },            
               {
                 "name": "DEPENDENCY_SERVICE",
-                "value": "mariadb"
+                "value": "{{  include "joinListWithColon" .Values.dependencies.db_sync.service }}"
               },
               {
                 "name": "DEPENDENCY_JOBS",
-                "value": "mariadb-seed,keystone-init"
+                "value": "{{  include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
               },
               {
                 "name": "COMMAND",

keystone/templates/deployment.yaml

@@ -20,15 +20,11 @@ spec:
               },
               {
                 "name": "DEPENDENCY_SERVICE",
-                "value": "mariadb,rabbitmq"
+                "value": "{{  include "joinListWithColon" .Values.dependencies.api.service }}"
               },
               {
                 "name": "DEPENDENCY_JOBS",
-                "value": "mariadb-seed"
+                "value": "{{  include "joinListWithColon" .Values.dependencies.api.jobs }}"
-              },
-              {
-                "name": "DEPENDENCY_CONFIG",
-                "value": "/etc/apache2/conf-enabled/wsgi-keystone.conf"
               },
               {
                 "name": "COMMAND",

keystone/templates/init.yaml

@@ -17,11 +17,11 @@ spec:
               },
               {
                 "name": "DEPENDENCY_SERVICE",
-                "value": "mariadb"
+                "value": "{{  include "joinListWithColon" .Values.dependencies.init.service }}"
               },
               {
                 "name": "DEPENDENCY_JOBS",
-                "value": "mariadb-seed"
+                "value": "{{  include "joinListWithColon" .Values.dependencies.init.jobs }}"
               },
               {
                 "name": "COMMAND",
@@ -36,6 +36,9 @@ spec:
         - name: keystone-init
           image: {{ .Values.images.init }}
           imagePullPolicy: Always
+          command:
+            - bash
+            - /tmp/init.sh
           volumeMounts:
             - name: initsh
               mountPath: /tmp/init.sh

keystone/values.yaml

@@ -39,3 +39,22 @@ database:
 misc:
   workers: 8
   debug: false
+
+dependencies:
+  api:
+    jobs: 
+    - mariadb-seed
+    - keystone-db-sync
+    service:
+    - mariadb
+  db_sync:
+    jobs:
+    - keystone-init
+    - mariadb-seed
+    service:
+    - mariadb
+  init:
+    jobs:
+    - mariadb-seed
+    service:
+    - mariadb