summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-19 21:25:09 +0000
committerGerrit Code Review <review@openstack.org>2017-07-19 21:25:09 +0000
commita34955d45135dc66477f2f162e76f9183762dd96 (patch)
tree96134b0311ebd216333d04d4c822168c8f270bd0
parent271f3b52a8056b4e29291e11818c3558962098d8 (diff)
parentc540733f1fea5ac0862519982e0dcab3205c57d5 (diff)
Merge "Wrap ceilometer-upgrade in boostrap_host_exec"
-rw-r--r--docker/services/ceilometer-agent-central.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index f8ba4eea..6caffd15 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -105,13 +105,17 @@ outputs:
net: host
detach: false
privileged: false
+ user: root
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
- /var/log/containers/ceilometer:/var/log/ceilometer
- command: ["/usr/bin/ceilometer-upgrade", "--skip-metering-database"]
+ command:
+ - '/usr/bin/bootstrap_host_exec'
+ - 'ceilometer_agent_central'
+ - "su ceilometer -s /bin/bash -c '/usr/bin/ceilometer-upgrade --skip-metering-database'"
upgrade_tasks:
- name: Stop and disable ceilometer agent central service
tags: step2