aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/ceilometer-agent-central.yaml
diff options
context:
space:
mode:
authorJose Luis Franco Arza <jfrancoa@redhat.com>2017-08-08 16:19:20 +0200
committerPradeep Kilambi <pkilambi@redhat.com>2017-08-11 15:01:27 -0400
commit9b79a9bc7424dc5de71d0024117a768f8d1f3bed (patch)
tree666c467bf019efd8bfd2740796b34b780201fd18 /docker/services/ceilometer-agent-central.yaml
parent5bf7d6582b2346a9c1671430ebead6c358508863 (diff)
Correct gnocchi-upgrade command quotes
After merging commit 488796, single quotation marks were missed. This causes the upgrade to fail as the flag --sacks-number is considered a su command flag. Also mounts Ceph config data into the container which seems needed for the gnocchi-upgrade command when configured to use Ceph. Also move the gnocchi db sync to step 4, so ceph is ready. Add a retry loop to ceilometer-upgrade cmd so it doesnt fail while apache is restarted. Closes-Bug: #1709322 Change-Id: I62f3a5fa2d43a2cd579f72286661d503e9f08b90
Diffstat (limited to 'docker/services/ceilometer-agent-central.yaml')
-rw-r--r--docker/services/ceilometer-agent-central.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index 6caffd1..424c316 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -115,7 +115,7 @@ outputs:
command:
- '/usr/bin/bootstrap_host_exec'
- 'ceilometer_agent_central'
- - "su ceilometer -s /bin/bash -c '/usr/bin/ceilometer-upgrade --skip-metering-database'"
+ - "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'"
upgrade_tasks:
- name: Stop and disable ceilometer agent central service
tags: step2