Increase the step for gnocchi_db_sync
swift-proxy and gnocchi both run on step_4. However, swift_proxy should
be ready before gnocchi. This patch moves gnocchi_db_sync to step_5 to
be sure that swift-proxy is started before gnocchi. gnocchi_db_sync has
higher start_order to start before other gnocchi services.
(cherry picked from commit 67489e63f0
)
Change-Id: I0044c78c4a6d751fc9d0cf6b54ed634032933934
Closes-Bug: 1781162
This commit is contained in:
parent
c8e7e2d457
commit
ae34bb71e0
|
@ -107,7 +107,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
|
||||
|
@ -122,7 +122,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:
|
||||
|
|
|
@ -132,8 +132,9 @@ outputs:
|
|||
volumes:
|
||||
- /var/lib/gnocchi:/var/lib/gnocchi:rw
|
||||
command: ['/bin/bash', '-c', 'chown -R gnocchi:gnocchi /var/lib/gnocchi']
|
||||
step_4:
|
||||
step_5:
|
||||
gnocchi_db_sync:
|
||||
start_order: 0
|
||||
image: *gnocchi_api_image
|
||||
net: host
|
||||
detach: false
|
||||
|
@ -151,9 +152,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
|
||||
|
|
|
@ -104,6 +104,7 @@ outputs:
|
|||
docker_config:
|
||||
step_5:
|
||||
gnocchi_metricd:
|
||||
start_order: 1
|
||||
image: {get_param: DockerGnocchiMetricdImage}
|
||||
net: host
|
||||
privileged: false
|
||||
|
|
|
@ -104,6 +104,7 @@ outputs:
|
|||
docker_config:
|
||||
step_5:
|
||||
gnocchi_statsd:
|
||||
start_order: 1
|
||||
image: {get_param: DockerGnocchiStatsdImage}
|
||||
net: host
|
||||
privileged: false
|
||||
|
|
Loading…
Reference in New Issue