diff --git a/glance/templates/job-init.yaml b/glance/templates/job-db-init.yaml
similarity index 89%
rename from glance/templates/job-init.yaml
rename to glance/templates/job-db-init.yaml
index 5bf5f0635c..c66375c96e 100644
--- a/glance/templates/job-init.yaml
+++ b/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
index d10670fea6..e8ab2f70a2 100644
--- 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,7 +75,7 @@ misc:
dependencies:
api:
jobs:
- - glance-init
+ - glance-db-init
- glance-db-sync
- keystone-db-sync
service:
@@ -83,7 +83,7 @@ dependencies:
- 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,10 +105,10 @@ dependencies:
- mariadb
post:
jobs:
- - glance-init
+ - glance-db-init
- glance-db-sync
- keystone-db-sync
- - keystone-init
+ - keystone-db-init
- mariadb-seed
service:
- mariadb
@@ -116,7 +116,7 @@ dependencies:
- 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 b/keystone/templates/job-db-init.yaml
similarity index 88%
rename from keystone/templates/job-init.yaml
rename to keystone/templates/job-db-init.yaml
index 4e41f4ff86..b0443a5931 100644
--- a/keystone/templates/job-init.yaml
+++ b/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
index 6e7fd06dce..1aa064a1d0 100644
--- 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 b/neutron/templates/job-db-init.yaml
similarity index 88%
rename from neutron/templates/job-init.yaml
rename to neutron/templates/job-db-init.yaml
index 430601b35d..b04d7c6338 100644
--- a/neutron/templates/job-init.yaml
+++ b/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
index 7f965b51b4..4502fe0d8c 100644
--- 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 b/nova/templates/job-db-init.yaml
similarity index 89%
rename from nova/templates/job-init.yaml
rename to nova/templates/job-db-init.yaml
index 8db6c2b664..dce9a652a7 100644
--- a/nova/templates/job-init.yaml
+++ b/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
index 1888add52b..6cc3baa28f 100644
--- 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: