summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 00:30:13 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 00:30:13 +0000
commit24d552ae33adfbbbeb7a1b51b2fe09263c8e9a95 (patch)
treeb62dfd4efa8416afba2df0c41bb2b16ffc630b3e
parentd68a938d14f6eb9d143cd9abee9ff5e2d16ae6dd (diff)
parent248099db8c583f6e80fda24f45db74361b757128 (diff)
Merge "Fix race conditions between containers"
-rw-r--r--docker/services/aodh-api.yaml5
-rw-r--r--docker/services/cinder-api.yaml5
-rw-r--r--docker/services/cinder-scheduler.yaml3
-rw-r--r--docker/services/congress-api.yaml5
-rw-r--r--docker/services/database/mysql.yaml5
-rw-r--r--docker/services/database/redis.yaml2
-rw-r--r--docker/services/glance-api.yaml5
-rw-r--r--docker/services/gnocchi-api.yaml5
-rw-r--r--docker/services/heat-engine.yaml5
-rw-r--r--docker/services/horizon.yaml4
-rw-r--r--docker/services/ironic-api.yaml4
-rw-r--r--docker/services/keystone.yaml5
-rw-r--r--docker/services/memcached.yaml1
-rw-r--r--docker/services/mistral-api.yaml8
-rw-r--r--docker/services/neutron-api.yaml5
-rw-r--r--docker/services/nova-api.yaml12
-rw-r--r--docker/services/panko-api.yaml5
-rw-r--r--docker/services/rabbitmq.yaml2
-rw-r--r--docker/services/tacker.yaml5
19 files changed, 43 insertions, 48 deletions
diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 4b93ddd..bda5469 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -86,16 +86,15 @@ outputs:
86 recurse: true 86 recurse: true
87 docker_config: 87 docker_config:
88 # db sync runs before permissions set by kolla_config 88 # db sync runs before permissions set by kolla_config
89 step_3: 89 step_2:
90 aodh_init_log: 90 aodh_init_log:
91 start_order: 0
92 image: *aodh_image 91 image: *aodh_image
93 user: root 92 user: root
94 volumes: 93 volumes:
95 - /var/log/containers/aodh:/var/log/aodh 94 - /var/log/containers/aodh:/var/log/aodh
96 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R aodh:aodh /var/log/aodh'] 95 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R aodh:aodh /var/log/aodh']
96 step_3:
97 aodh_db_sync: 97 aodh_db_sync:
98 start_order: 1
99 image: *aodh_image 98 image: *aodh_image
100 net: host 99 net: host
101 privileged: false 100 privileged: false
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 062f5fc..94bd66d 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -87,9 +87,8 @@ outputs:
87 owner: cinder:cinder 87 owner: cinder:cinder
88 recurse: true 88 recurse: true
89 docker_config: 89 docker_config:
90 step_3: 90 step_2:
91 cinder_api_init_logs: 91 cinder_api_init_logs:
92 start_order: 0
93 image: &cinder_api_image 92 image: &cinder_api_image
94 list_join: 93 list_join:
95 - '/' 94 - '/'
@@ -99,6 +98,7 @@ outputs:
99 volumes: 98 volumes:
100 - /var/log/containers/cinder:/var/log/cinder 99 - /var/log/containers/cinder:/var/log/cinder
101 command: ['/bin/bash', '-c', 'chown -R cinder:cinder /var/log/cinder'] 100 command: ['/bin/bash', '-c', 'chown -R cinder:cinder /var/log/cinder']
101 step_3:
102 cinder_api_db_sync: 102 cinder_api_db_sync:
103 image: *cinder_api_image 103 image: *cinder_api_image
104 net: host 104 net: host
@@ -110,6 +110,7 @@ outputs:
110 - {get_attr: [ContainersCommon, volumes]} 110 - {get_attr: [ContainersCommon, volumes]}
111 - 111 -
112 - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro 112 - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
113 - /var/log/containers/cinder:/var/log/cinder
113 command: 114 command:
114 - '/usr/bin/bootstrap_host_exec' 115 - '/usr/bin/bootstrap_host_exec'
115 - 'cinder_api' 116 - 'cinder_api'
diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index 9d94b57..8199c34 100644
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -81,9 +81,8 @@ outputs:
81 owner: cinder:cinder 81 owner: cinder:cinder
82 recurse: true 82 recurse: true
83 docker_config: 83 docker_config:
84 step_3: 84 step_2:
85 cinder_scheduler_init_logs: 85 cinder_scheduler_init_logs:
86 start_order: 0
87 image: &cinder_scheduler_image 86 image: &cinder_scheduler_image
88 list_join: 87 list_join:
89 - '/' 88 - '/'
diff --git a/docker/services/congress-api.yaml b/docker/services/congress-api.yaml
index 3ee1d91..92b0eeb 100644
--- a/docker/services/congress-api.yaml
+++ b/docker/services/congress-api.yaml
@@ -82,9 +82,8 @@ outputs:
82 recurse: true 82 recurse: true
83 docker_config: 83 docker_config:
84 # db sync runs before permissions set by kolla_config 84 # db sync runs before permissions set by kolla_config
85 step_3: 85 step_2:
86 congress_init_logs: 86 congress_init_logs:
87 start_order: 0
88 image: &congress_image 87 image: &congress_image
89 list_join: 88 list_join:
90 - '/' 89 - '/'
@@ -94,8 +93,8 @@ outputs:
94 volumes: 93 volumes:
95 - /var/log/containers/congress:/var/log/congress 94 - /var/log/containers/congress:/var/log/congress
96 command: ['/bin/bash', '-c', 'chown -R congress:congress /var/log/congress'] 95 command: ['/bin/bash', '-c', 'chown -R congress:congress /var/log/congress']
96 step_3:
97 congress_db_sync: 97 congress_db_sync:
98 start_order: 1
99 image: *congress_image 98 image: *congress_image
100 net: host 99 net: host
101 privileged: false 100 privileged: false
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index c73db85..9eabb71 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -87,17 +87,16 @@ outputs:
87 recurse: true 87 recurse: true
88 docker_config: 88 docker_config:
89 # Kolla_bootstrap runs before permissions set by kolla_config 89 # Kolla_bootstrap runs before permissions set by kolla_config
90 step_2: 90 step_1:
91 mysql_init_logs: 91 mysql_init_logs:
92 start_order: 0
93 image: *mysql_image 92 image: *mysql_image
94 privileged: false 93 privileged: false
95 user: root 94 user: root
96 volumes: 95 volumes:
97 - /var/log/containers/mysql:/var/log/mariadb 96 - /var/log/containers/mysql:/var/log/mariadb
98 command: ['/bin/bash', '-c', 'chown -R mysql:mysql /var/log/mariadb'] 97 command: ['/bin/bash', '-c', 'chown -R mysql:mysql /var/log/mariadb']
98 step_2:
99 mysql_bootstrap: 99 mysql_bootstrap:
100 start_order: 1
101 detach: false 100 detach: false
102 image: *mysql_image 101 image: *mysql_image
103 net: host 102 net: host
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index 9e84dd5..9d0d30c 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -79,6 +79,7 @@ outputs:
79 step_1: 79 step_1:
80 redis_init_logs: 80 redis_init_logs:
81 start_order: 0 81 start_order: 0
82 detach: false
82 image: *redis_image 83 image: *redis_image
83 privileged: false 84 privileged: false
84 user: root 85 user: root
@@ -86,6 +87,7 @@ outputs:
86 - /var/log/containers/redis:/var/log/redis 87 - /var/log/containers/redis:/var/log/redis
87 command: ['/bin/bash', '-c', 'chown -R redis:redis /var/log/redis'] 88 command: ['/bin/bash', '-c', 'chown -R redis:redis /var/log/redis']
88 redis: 89 redis:
90 start_order: 1
89 image: *redis_image 91 image: *redis_image
90 net: host 92 net: host
91 privileged: false 93 privileged: false
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index c3af523..5c24401 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -85,17 +85,16 @@ outputs:
85 command: /usr/sbin/httpd -DFOREGROUND 85 command: /usr/sbin/httpd -DFOREGROUND
86 docker_config: 86 docker_config:
87 # Kolla_bootstrap/db_sync runs before permissions set by kolla_config 87 # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
88 step_3: 88 step_2:
89 glance_init_logs: 89 glance_init_logs:
90 start_order: 0
91 image: *glance_image 90 image: *glance_image
92 privileged: false 91 privileged: false
93 user: root 92 user: root
94 volumes: 93 volumes:
95 - /var/log/containers/glance:/var/log/glance 94 - /var/log/containers/glance:/var/log/glance
96 command: ['/bin/bash', '-c', 'chown -R glance:glance /var/log/glance'] 95 command: ['/bin/bash', '-c', 'chown -R glance:glance /var/log/glance']
96 step_3:
97 glance_api_db_sync: 97 glance_api_db_sync:
98 start_order: 1
99 image: *glance_image 98 image: *glance_image
100 net: host 99 net: host
101 privileged: false 100 privileged: false
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index e3b72bc..bd1c316 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -86,16 +86,15 @@ outputs:
86 recurse: true 86 recurse: true
87 docker_config: 87 docker_config:
88 # db sync runs before permissions set by kolla_config 88 # db sync runs before permissions set by kolla_config
89 step_3: 89 step_2:
90 gnocchi_init_log: 90 gnocchi_init_log:
91 start_order: 0
92 image: *gnocchi_image 91 image: *gnocchi_image
93 user: root 92 user: root
94 volumes: 93 volumes:
95 - /var/log/containers/gnocchi:/var/log/gnocchi 94 - /var/log/containers/gnocchi:/var/log/gnocchi
96 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R gnocchi:gnocchi /var/log/gnocchi'] 95 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R gnocchi:gnocchi /var/log/gnocchi']
96 step_3:
97 gnocchi_db_sync: 97 gnocchi_db_sync:
98 start_order: 1
99 image: *gnocchi_image 98 image: *gnocchi_image
100 net: host 99 net: host
101 detach: false 100 detach: false
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index 0adad53..7a3312d 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -80,16 +80,15 @@ outputs:
80 recurse: true 80 recurse: true
81 docker_config: 81 docker_config:
82 # db sync runs before permissions set by kolla_config 82 # db sync runs before permissions set by kolla_config
83 step_3: 83 step_2:
84 heat_init_log: 84 heat_init_log:
85 start_order: 0
86 image: *heat_engine_image 85 image: *heat_engine_image
87 user: root 86 user: root
88 volumes: 87 volumes:
89 - /var/log/containers/heat:/var/log/heat 88 - /var/log/containers/heat:/var/log/heat
90 command: ['/bin/bash', '-c', 'chown -R heat:heat /var/log/heat'] 89 command: ['/bin/bash', '-c', 'chown -R heat:heat /var/log/heat']
90 step_3:
91 heat_engine_db_sync: 91 heat_engine_db_sync:
92 start_order: 1
93 image: *heat_engine_image 92 image: *heat_engine_image
94 net: host 93 net: host
95 privileged: false 94 privileged: false
diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 022eb5d..13bd091 100644
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -86,7 +86,7 @@ outputs:
86 owner: apache:apache 86 owner: apache:apache
87 recurse: false 87 recurse: false
88 docker_config: 88 docker_config:
89 step_3: 89 step_2:
90 horizon_fix_perms: 90 horizon_fix_perms:
91 image: *horizon_image 91 image: *horizon_image
92 user: root 92 user: root
@@ -99,8 +99,8 @@ outputs:
99 volumes: 99 volumes:
100 - /var/log/containers/horizon:/var/log/horizon 100 - /var/log/containers/horizon:/var/log/horizon
101 - /var/lib/config-data/horizon/etc/:/etc/ 101 - /var/lib/config-data/horizon/etc/:/etc/
102 step_3:
102 horizon: 103 horizon:
103 start_order: 1
104 image: *horizon_image 104 image: *horizon_image
105 net: host 105 net: host
106 privileged: false 106 privileged: false
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 650ce4c..a32176a 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -82,9 +82,8 @@ outputs:
82 recurse: true 82 recurse: true
83 docker_config: 83 docker_config:
84 # db sync runs before permissions set by kolla_config 84 # db sync runs before permissions set by kolla_config
85 step_3: 85 step_2:
86 ironic_init_logs: 86 ironic_init_logs:
87 start_order: 0
88 image: &ironic_image 87 image: &ironic_image
89 list_join: 88 list_join:
90 - '/' 89 - '/'
@@ -94,6 +93,7 @@ outputs:
94 volumes: 93 volumes:
95 - /var/log/containers/ironic:/var/log/ironic 94 - /var/log/containers/ironic:/var/log/ironic
96 command: ['/bin/bash', '-c', 'chown -R ironic:ironic /var/log/ironic'] 95 command: ['/bin/bash', '-c', 'chown -R ironic:ironic /var/log/ironic']
96 step_3:
97 ironic_db_sync: 97 ironic_db_sync:
98 start_order: 1 98 start_order: 1
99 image: *ironic_image 99 image: *ironic_image
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 5b253b4..4cd44f2 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -95,16 +95,15 @@ outputs:
95 command: /usr/sbin/httpd -DFOREGROUND 95 command: /usr/sbin/httpd -DFOREGROUND
96 docker_config: 96 docker_config:
97 # Kolla_bootstrap/db sync runs before permissions set by kolla_config 97 # Kolla_bootstrap/db sync runs before permissions set by kolla_config
98 step_3: 98 step_2:
99 keystone_init_log: 99 keystone_init_log:
100 start_order: 0
101 image: *keystone_image 100 image: *keystone_image
102 user: root 101 user: root
103 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R keystone:keystone /var/log/keystone'] 102 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R keystone:keystone /var/log/keystone']
104 volumes: 103 volumes:
105 - /var/log/containers/keystone:/var/log/keystone 104 - /var/log/containers/keystone:/var/log/keystone
105 step_3:
106 keystone_db_sync: 106 keystone_db_sync:
107 start_order: 1
108 image: *keystone_image 107 image: *keystone_image
109 net: host 108 net: host
110 privileged: false 109 privileged: false
diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index d85a087..d453964 100644
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -72,6 +72,7 @@ outputs:
72 step_1: 72 step_1:
73 memcached_init_logs: 73 memcached_init_logs:
74 start_order: 0 74 start_order: 0
75 detach: false
75 image: *memcached_image 76 image: *memcached_image
76 privileged: false 77 privileged: false
77 user: root 78 user: root
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index cc7e613..30c3cde 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -82,9 +82,8 @@ outputs:
82 recurse: true 82 recurse: true
83 docker_config: 83 docker_config:
84 # db sync runs before permissions set by kolla_config 84 # db sync runs before permissions set by kolla_config
85 step_3: 85 step_2:
86 mistral_init_logs: 86 mistral_init_logs:
87 start_order: 0
88 image: &mistral_image 87 image: &mistral_image
89 list_join: 88 list_join:
90 - '/' 89 - '/'
@@ -94,8 +93,9 @@ outputs:
94 volumes: 93 volumes:
95 - /var/log/containers/mistral:/var/log/mistral 94 - /var/log/containers/mistral:/var/log/mistral
96 command: ['/bin/bash', '-c', 'chown -R mistral:mistral /var/log/mistral'] 95 command: ['/bin/bash', '-c', 'chown -R mistral:mistral /var/log/mistral']
96 step_3:
97 mistral_db_sync: 97 mistral_db_sync:
98 start_order: 1 98 start_order: 0
99 image: *mistral_image 99 image: *mistral_image
100 net: host 100 net: host
101 privileged: false 101 privileged: false
@@ -109,7 +109,7 @@ outputs:
109 - /var/log/containers/mistral:/var/log/mistral 109 - /var/log/containers/mistral:/var/log/mistral
110 command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'" 110 command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
111 mistral_db_populate: 111 mistral_db_populate:
112 start_order: 2 112 start_order: 1
113 image: *mistral_image 113 image: *mistral_image
114 net: host 114 net: host
115 privileged: false 115 privileged: false
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index fbdf75a..6c2d4ca 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -92,9 +92,8 @@ outputs:
92 command: /usr/sbin/httpd -DFOREGROUND 92 command: /usr/sbin/httpd -DFOREGROUND
93 docker_config: 93 docker_config:
94 # db sync runs before permissions set by kolla_config 94 # db sync runs before permissions set by kolla_config
95 step_3: 95 step_2:
96 neutron_init_logs: 96 neutron_init_logs:
97 start_order: 0
98 image: &neutron_api_image 97 image: &neutron_api_image
99 list_join: 98 list_join:
100 - '/' 99 - '/'
@@ -104,8 +103,8 @@ outputs:
104 volumes: 103 volumes:
105 - /var/log/containers/neutron:/var/log/neutron 104 - /var/log/containers/neutron:/var/log/neutron
106 command: ['/bin/bash', '-c', 'chown -R neutron:neutron /var/log/neutron'] 105 command: ['/bin/bash', '-c', 'chown -R neutron:neutron /var/log/neutron']
106 step_3:
107 neutron_db_sync: 107 neutron_db_sync:
108 start_order: 1
109 image: *neutron_api_image 108 image: *neutron_api_image
110 net: host 109 net: host
111 privileged: false 110 privileged: false
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 2375dad..c97f45d 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -86,9 +86,8 @@ outputs:
86 recurse: true 86 recurse: true
87 docker_config: 87 docker_config:
88 # db sync runs before permissions set by kolla_config 88 # db sync runs before permissions set by kolla_config
89 step_3: 89 step_2:
90 nova_init_logs: 90 nova_init_logs:
91 start_order: 0
92 image: &nova_api_image 91 image: &nova_api_image
93 list_join: 92 list_join:
94 - '/' 93 - '/'
@@ -98,8 +97,9 @@ outputs:
98 volumes: 97 volumes:
99 - /var/log/containers/nova:/var/log/nova 98 - /var/log/containers/nova:/var/log/nova
100 command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova'] 99 command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova']
100 step_3:
101 nova_api_db_sync: 101 nova_api_db_sync:
102 start_order: 1 102 start_order: 0
103 image: *nova_api_image 103 image: *nova_api_image
104 net: host 104 net: host
105 detach: false 105 detach: false
@@ -116,7 +116,7 @@ outputs:
116 # to be capable of upgrading a baremetal setup. This is to ensure the name 116 # to be capable of upgrading a baremetal setup. This is to ensure the name
117 # of the cell is 'default' 117 # of the cell is 'default'
118 nova_api_map_cell0: 118 nova_api_map_cell0:
119 start_order: 2 119 start_order: 1
120 image: *nova_api_image 120 image: *nova_api_image
121 net: host 121 net: host
122 detach: false 122 detach: false
@@ -124,7 +124,7 @@ outputs:
124 volumes: *nova_api_volumes 124 volumes: *nova_api_volumes
125 command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage cell_v2 map_cell0'" 125 command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage cell_v2 map_cell0'"
126 nova_api_create_default_cell: 126 nova_api_create_default_cell:
127 start_order: 3 127 start_order: 2
128 image: *nova_api_image 128 image: *nova_api_image
129 net: host 129 net: host
130 detach: false 130 detach: false
@@ -136,7 +136,7 @@ outputs:
136 user: root 136 user: root
137 command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage cell_v2 create_cell --name=default'" 137 command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage cell_v2 create_cell --name=default'"
138 nova_db_sync: 138 nova_db_sync:
139 start_order: 4 139 start_order: 3
140 image: *nova_api_image 140 image: *nova_api_image
141 net: host 141 net: host
142 detach: false 142 detach: false
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index c381c0d..585148e 100644
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -87,16 +87,15 @@ outputs:
87 owner: panko:panko 87 owner: panko:panko
88 recurse: true 88 recurse: true
89 docker_config: 89 docker_config:
90 step_3: 90 step_2:
91 panko_init_log: 91 panko_init_log:
92 start_order: 0
93 image: *panko_image 92 image: *panko_image
94 user: root 93 user: root
95 volumes: 94 volumes:
96 - /var/log/containers/panko:/var/log/panko 95 - /var/log/containers/panko:/var/log/panko
97 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko'] 96 command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko']
97 step_3:
98 panko_db_sync: 98 panko_db_sync:
99 start_order: 1
100 image: *panko_image 99 image: *panko_image
101 net: host 100 net: host
102 detach: false 101 detach: false
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index 609aec0..06d663c 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -89,6 +89,7 @@ outputs:
89 step_1: 89 step_1:
90 rabbitmq_init_logs: 90 rabbitmq_init_logs:
91 start_order: 0 91 start_order: 0
92 detach: false
92 image: *rabbitmq_image 93 image: *rabbitmq_image
93 privileged: false 94 privileged: false
94 user: root 95 user: root
@@ -97,6 +98,7 @@ outputs:
97 command: ['/bin/bash', '-c', 'chown -R rabbitmq:rabbitmq /var/log/rabbitmq'] 98 command: ['/bin/bash', '-c', 'chown -R rabbitmq:rabbitmq /var/log/rabbitmq']
98 rabbitmq_bootstrap: 99 rabbitmq_bootstrap:
99 start_order: 1 100 start_order: 1
101 detach: false
100 image: *rabbitmq_image 102 image: *rabbitmq_image
101 net: host 103 net: host
102 privileged: false 104 privileged: false
diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 2fc99d6..df9750c 100644
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -82,9 +82,8 @@ outputs:
82 recurse: true 82 recurse: true
83 docker_config: 83 docker_config:
84 # db sync runs before permissions set by kolla_config 84 # db sync runs before permissions set by kolla_config
85 step_3: 85 step_2:
86 tacker_init_logs: 86 tacker_init_logs:
87 start_order: 0
88 image: &tacker_image 87 image: &tacker_image
89 list_join: 88 list_join:
90 - '/' 89 - '/'
@@ -94,8 +93,8 @@ outputs:
94 volumes: 93 volumes:
95 - /var/log/containers/tacker:/var/log/tacker 94 - /var/log/containers/tacker:/var/log/tacker
96 command: ['/bin/bash', '-c', 'chown -R tacker:tacker /var/log/tacker'] 95 command: ['/bin/bash', '-c', 'chown -R tacker:tacker /var/log/tacker']
96 step_3:
97 tacker_db_sync: 97 tacker_db_sync:
98 start_order: 1
99 image: *tacker_image 98 image: *tacker_image
100 net: host 99 net: host
101 privileged: false 100 privileged: false