From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 13 Apr 2017 06:52:01 +0000 (+0300)
Subject: Use underscore for Aodh and Gnocchi's container names
X-Git-Tag: opnfv-6.0.0~765^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7862388ffbecbcaa86bb3efbddf6e5ced1949987;p=apex-tripleo-heat-templates.git

Use underscore for Aodh and Gnocchi's container names

The rest of the services are using underscores, so this helps
uniformity.

Change-Id: I4ce3cc76f430a19fa08c77b004b86ecad02119ae
---

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