summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-19 05:26:58 +0000
committerGerrit Code Review <review@openstack.org>2017-04-19 05:26:58 +0000
commit8137335445af0aa2565fda390ef04c54d5db1756 (patch)
treea17be98303be444c5bedabd7b433539ec79f7138 /docker
parent7d24cb66d8ef6c79a661db49b79079e897e736f6 (diff)
parent7862388ffbecbcaa86bb3efbddf6e5ced1949987 (diff)
Merge "Use underscore for Aodh and Gnocchi's container names"
Diffstat (limited to 'docker')
-rw-r--r--docker/services/aodh-api.yaml4
-rw-r--r--docker/services/gnocchi-api.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 32294958..38177220 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -62,7 +62,7 @@ outputs:
command: /usr/sbin/httpd -DFOREGROUND
docker_config:
step_3:
- aodh-init-log:
+ aodh_init_log:
start_order: 0
image: *aodh_image
user: root
@@ -82,7 +82,7 @@ outputs:
- logs:/var/log
command: /usr/bin/aodh-dbsync
step_4:
- aodh-api:
+ aodh_api:
image: *aodh_image
net: host
privileged: false
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 659785aa..0108d2ae 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -62,7 +62,7 @@ outputs:
command: /usr/sbin/httpd -DFOREGROUND
docker_config:
step_3:
- gnocchi-init-log:
+ gnocchi_init_log:
start_order: 0
image: *gnocchi_image
user: root
@@ -82,7 +82,7 @@ outputs:
- logs:/var/log
command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"]
step_4:
- gnocchi-api:
+ gnocchi_api:
image: *gnocchi_image
net: host
privileged: false