Standardise DB Job names

Standardise the DB creation job name to service-db-init for all services.
mattmceuen · Jan 22, 2017 · 8317202 · 8317202
1 parent 2d5fd2d
commit 8317202
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 40 deletions.
diff --git a/glance/templates/job-init.yaml → glance/templates/job-db-init.yaml b/glance/templates/job-init.yaml → glance/templates/job-db-init.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: glance-init
+  name: glance-db-init
 spec:
   template:
     metadata:
@@ -16,8 +16,8 @@ spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
-        - name: glance-init
-          image: {{ .Values.images.init }}
+        - name: glance-db-init
+          image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           env:
           - name: ANSIBLE_LIBRARY

diff --git a/glance/values.yaml b/glance/values.yaml
@@ -16,9 +16,9 @@ labels:
   node_selector_value: enabled
 
 images:
+  db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   db_sync: quay.io/stackanetes/stackanetes-glance-api:newton
   api: quay.io/stackanetes/stackanetes-glance-api:newton
-  init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   registry: quay.io/stackanetes/stackanetes-glance-registry:newton
   post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
@@ -75,15 +75,15 @@ misc:
 dependencies:
   api:
     jobs:
-    - glance-init
+    - glance-db-init
     - glance-db-sync
     - keystone-db-sync
     service:
     - keystone-api
     - mariadb
   registry:
     jobs:
-    - glance-init
+    - glance-db-init
     - glance-db-sync
     - keystone-db-sync
     service:
@@ -92,9 +92,9 @@ dependencies:
     - glance-api
   db_sync:
     jobs:
-    - keystone-init
+    - keystone-db-init
     - keystone-db-sync
-    - glance-init
+    - glance-db-init
     - mariadb-seed
     service:
     - mariadb
@@ -105,18 +105,18 @@ dependencies:
     - mariadb
   post:
     jobs:
-    - glance-init
+    - glance-db-init
     - glance-db-sync
     - keystone-db-sync
-    - keystone-init
+    - keystone-db-init
     - mariadb-seed
     service:
     - mariadb
     - keystone-api
     - glance-api
     - glance-registry
 
-# typically overriden by environmental 
+# typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
 endpoints:
@@ -138,4 +138,3 @@ endpoints:
     port:
         admin: 35357
         public: 5000
-
diff --git a/keystone/templates/job-init.yaml → keystone/templates/job-db-init.yaml b/keystone/templates/job-init.yaml → keystone/templates/job-db-init.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: keystone-init
+  name: keystone-db-init
 spec:
   template:
     metadata:
@@ -16,8 +16,8 @@ spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
-        - name: keystone-init
-          image: {{ .Values.images.init }}
+        - name: keystone-db-init
+          image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - bash

diff --git a/keystone/values.yaml b/keystone/values.yaml
@@ -10,9 +10,9 @@ labels:
   node_selector_value: enabled
 
 images:
+  db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   db_sync: quay.io/stackanetes/stackanetes-keystone-api:newton
   api: quay.io/stackanetes/stackanetes-keystone-api:newton
-  init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
   pull_policy: "IfNotPresent"
 
@@ -67,7 +67,7 @@ dependencies:
     - mariadb
   db_sync:
     jobs:
-    - keystone-init
+    - keystone-db-init
     - mariadb-seed
     service:
     - mariadb

diff --git a/neutron/templates/job-init.yaml → neutron/templates/job-db-init.yaml b/neutron/templates/job-init.yaml → neutron/templates/job-db-init.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: neutron-init
+  name: neutron-db-init
 spec:
   template:
     metadata:
@@ -16,8 +16,8 @@ spec:
       nodeSelector:
         {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
-        - name: neutron-init
-          image: {{ .Values.images.init }}
+        - name: neutron-db-init
+          image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - bash

diff --git a/neutron/values.yaml b/neutron/values.yaml
@@ -7,7 +7,7 @@ replicas:
   server: 1
 
 images:
-  init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
+  db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   db_sync: quay.io/stackanetes/stackanetes-neutron-server:newton
   server: quay.io/stackanetes/stackanetes-neutron-server:newton
   dhcp: quay.io/stackanetes/stackanetes-neutron-dhcp-agent:newton
@@ -151,7 +151,7 @@ dependencies:
     - rabbitmq
     - nova-api
     jobs:
-    - neutron-init
+    - neutron-db-init
     - nova-post
     daemonset:
     - ovs-agent
@@ -160,7 +160,7 @@ dependencies:
     - rabbitmq
     - nova-api
     jobs:
-    - neutron-init
+    - neutron-db-init
     - nova-post
     daemonset:
     - ovs-agent
@@ -178,8 +178,8 @@ dependencies:
     - rabbitmq
     - nova-api
     jobs:
-    - nova-init
-    - neutron-init
+    - nova-db-init
+    - neutron-db-init
     - nova-post
     daemonset:
     - ovs-agent

diff --git a/nova/templates/job-init.yaml → nova/templates/job-db-init.yaml b/nova/templates/job-init.yaml → nova/templates/job-db-init.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: nova-init
+  name: nova-db-init
 spec:
   template:
     metadata:
@@ -16,8 +16,8 @@ spec:
       nodeSelector:
         {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
-        - name: nova-init
-          image: {{ .Values.images.init }}
+        - name: nova-db-init
+          image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - bash

diff --git a/nova/values.yaml b/nova/values.yaml
@@ -13,7 +13,7 @@ control_replicas: 1
 compute_replicas: 1
 
 images:
-  init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
+  db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   db_sync: quay.io/stackanetes/stackanetes-nova-api:newton
   api: quay.io/stackanetes/stackanetes-nova-api:newton
   conductor: quay.io/stackanetes/stackanetes-nova-conductor:newton
@@ -108,31 +108,31 @@ memcached:
 
 dependencies:
   api:
-    jobs: 
+    jobs:
     - keystone-db-sync
-    - nova-init
+    - nova-db-init
     - nova-db-sync
     service:
     - mariadb
   db_sync:
     jobs:
-    - nova-init
-    - keystone-init
+    - nova-db-init
+    - keystone-db-init
     - mariadb-seed
     service:
     - mariadb
   db_sync:
     jobs:
-    - nova-init
-    - keystone-init
+    - nova-db-init
+    - keystone-db-init
     - mariadb-seed
     - keystone-db-sync
     service:
     - mariadb
   post:
     jobs:
-    - nova-init
-    - keystone-init
+    - nova-db-init
+    - keystone-db-init
     - mariadb-seed
     service:
     - mariadb
@@ -152,7 +152,7 @@ dependencies:
     - ovs-agent
   libvirt:
     jobs:
-    - nova-init
+    - nova-db-init
     - nova-post
     - nova-db-sync
     service:
@@ -162,7 +162,7 @@ dependencies:
     jobs:
     - mariadb-seed
     - keystone-db-sync
-    - nova-init
+    - nova-db-init
     - nova-db-sync
     service:
     - mariadb
@@ -177,7 +177,7 @@ dependencies:
     service:
     - mariadb
 
-# typically overriden by environmental 
+# typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
 endpoints: