incorporate cleanup feedback from PR#11

ceph/values.yaml

@@ -14,9 +14,9 @@ images:
 labels:
   node_selector_key: ceph-storage
   node_selector_value: enabled
-  
+
 network:
   port: 
     mon: 6789
     rgw_ingress: 80
-    rgw_target: 8088
+    rgw_target: 8088

keystone/requirements.yaml

@@ -13,4 +13,4 @@ dependencies:
 dependencies:
   - name: memcached
     repository: http://localhost:8879/charts
-    version: 0.1.0    
+    version: 0.1.0

keystone/templates/db-sync.yaml

@@ -11,13 +11,17 @@ spec:
             "name": "init",
             "image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
             "env": [
+              {
+                "name": "NAMESPACE",
+                "value": "{{ .Release.Namespace }}"
+              },            
               {
                 "name": "DEPENDENCY_SERVICE",
                 "value": "mariadb"
               },
               {
                 "name": "DEPENDENCY_JOBS",
-                "value": "mariadb-seed,keystone-init"
+                "value": "mariadb-seed,keystone-db-sync"
               },
               {
                 "name": "COMMAND",
@@ -26,7 +30,6 @@ spec:
             ]
           }
         ]'
- 
     spec:
       restartPolicy: OnFailure
       containers:
@@ -34,25 +37,8 @@ spec:
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: Always
           command:
-          - bash
+            - bash
-          - /tmp/db-sync.sh
+            - /tmp/db-sync.sh
-          env:
-            - name: INTERFACE_NAME
-              value: "eth0"
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: COMMAND
-              value: "bash /tmp/db-sync.sh"
-            - name: DEPENDENCY_JOBS
-              value: "keystone-init,mariadb-seed"
-            - name: DEPENDENCY_SERVICE
-              value: "mariadb"
           volumeMounts:
             - name: keystoneconf
               mountPath: /etc/keystone/keystone.conf

keystone/templates/deployment.yaml

@@ -20,16 +20,20 @@ spec:
               },
               {
                 "name": "DEPENDENCY_SERVICE",
-                "value": "mariadb"
+                "value": "mariadb,rabbitmq"
               },
               {
                 "name": "DEPENDENCY_JOBS",
                 "value": "mariadb-seed"
               },
+              {
+                "name": "DEPENDENCY_CONFIG",
+                "value": "/etc/apache2/conf-enabled/wsgi-keystone.conf"
+              },
               {
                 "name": "COMMAND",
                 "value": "echo done"
-              }
+              }              
             ]
           }
         ]'
@@ -40,27 +44,8 @@ spec:
         - name: keystone-api
           image: {{ .Values.images.api }}
           command:
-          - bash 
+            - bash
-          - /tmp/start.sh
+            - /tmp/start.sh
-          env:
-            - name: INTERFACE_NAME
-              value: "eth0"
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: COMMAND
-              value: "bash /tmp/start.sh"
-            - name: DEPENDENCY_JOBS
-              value: "keystone-init,keystone-db-sync,mariadb-seed"
-            - name: DEPENDENCY_SERVICE
-              value: "mariadb,rabbitmq"
-            - name: DEPENDENCY_CONFIG
-              value: "/etc/apache2/conf-enabled/wsgi-keystone.conf"
           ports:
             - containerPort: {{ .Values.network.port.public }}
             - containerPort: {{ .Values.network.port.admin }}

keystone/templates/init.yaml

@@ -11,13 +11,17 @@ spec:
             "name": "init",
             "image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
             "env": [
+              {
+                "name": "NAMESPACE",
+                "value": "{{ .Release.Namespace }}"
+              },
               {
                 "name": "DEPENDENCY_SERVICE",
                 "value": "mariadb"
               },
               {
                 "name": "DEPENDENCY_JOBS",
-                "value": "mariadb-seed,keystone-init"
+                "value": "mariadb-seed"
               },
               {
                 "name": "COMMAND",
@@ -32,23 +36,6 @@ spec:
         - name: keystone-init
           image: {{ .Values.images.init }}
           imagePullPolicy: Always
-          env:
-            - name: INTERFACE_NAME
-              value: "eth0"
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: COMMAND
-              value: "bash /tmp/init.sh"
-            - name: DEPENDENCY_JOBS
-              value: "mariadb-seed"
-            - name: DEPENDENCY_SERVICE
-              value: "mariadb"
           volumeMounts:
             - name: initsh
               mountPath: /tmp/init.sh

mariadb/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: openstack-base
     repository: http://localhost:8879/charts
-    version: 0.1.0
+    version: 0.1.0

memcached/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: openstack-base
     repository: http://localhost:8879/charts
-    version: 0.1.0
+    version: 0.1.0

memcached/templates/deployment.yaml

@@ -15,19 +15,7 @@ spec:
         - name: memcached
           image: {{ .Values.images.memcached }}
           imagePullPolicy: Always
-          env:
+          command: "memcached -v -p {{ .Values.network.port }} -U 0 -c 8192 -m 1024"
-            - name: INTERFACE_NAME
-              value: "eth0"
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: COMMAND
-              value: "memcached -v -p {{ .Values.network.port }} -U 0 -c 8192 -m 1024"
           ports:
             - containerPort: {{ .Values.network.port }}
           readinessProbe:

rabbitmq/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
   - name: openstack-base
     repository: http://localhost:8879/charts
-    version: 0.1.0
+    version: 0.1.0

rabbitmq/templates/service.yaml

@@ -6,4 +6,4 @@ spec:
   ports:
   - port: {{.Values.network.port.public}}
   selector:
-    app: rabbitmq
+    app: rabbitmq

rabbitmq/values.yaml

@@ -23,4 +23,3 @@ network:
 
 images:
   rabbitmq: "rabbitmq:3-management"
-