Merge "Increase the step for gnocchi_db_sync"

docker/services/ceilometer-agent-central.yaml

@@ -120,7 +120,7 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
         step_5:
           ceilometer_gnocchi_upgrade:
-            start_order: 1
+            start_order: 99
             image: *ceilometer_agent_central_image
             net: host
             detach: false
@@ -137,7 +137,7 @@ outputs:
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'ceilometer_agent_central'
-              - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade --skip-metering-database && exit 0 || sleep 5; done; exit 1'"
+              - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade --skip-metering-database && exit 0 || sleep 30; done; exit 1'"
       host_prep_tasks:
         - name: create persistent logs directory
           file:

docker/services/gnocchi-api.yaml

@@ -165,8 +165,9 @@ outputs:
               - str_replace:
                   template: 'chown -R gnocchi:gnocchi GNOCCHI_FILE_BASE_PATH'
                   params: {GNOCCHI_FILE_BASE_PATH: {get_param: GnocchiFileBasePath}}
-        step_4:
+        step_5:
           gnocchi_db_sync:
+            start_order: 0
             image: *gnocchi_api_image
             net: host
             detach: false
@@ -186,9 +187,9 @@ outputs:
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-        step_5:
           gnocchi_api:
             image: *gnocchi_api_image
+            start_order: 1
             net: host
             privileged: false
             restart: always

docker/services/gnocchi-metricd.yaml

@@ -118,6 +118,7 @@ outputs:
       docker_config:
         step_5:
           gnocchi_metricd:
+            start_order: 1
             image: {get_param: DockerGnocchiMetricdImage}
             net: host
             privileged: false

docker/services/gnocchi-statsd.yaml

@@ -118,6 +118,7 @@ outputs:
       docker_config:
         step_5:
           gnocchi_statsd:
+            start_order: 1
             image: {get_param: DockerGnocchiStatsdImage}
             net: host
             privileged: false