openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove ceilometer upgrade from other ceilometer containers"

This commit is contained in:
Jenkins 2017-06-30 01:08:33 +00:00 committed by Gerrit Code Review
parent e8d8eae59c 244b8bf13e
commit 3496ba241b
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/services/ceilometer-agent-ipmi.yaml
View File

@ -100,20 +100,6 @@ outputs:
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
step_5:
ceilometer_gnocchi_upgrade:
start_order: 1
image: *ceilometer_agent_ipmi_image
net: host
detach: false
privileged: false
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/bootstrap_host_exec ceilometer su ceilometer -s /bin/bash -c '/usr/bin/ceilometer-upgrade --skip-metering-database'"
upgrade_tasks:
- name: Stop and disable ceilometer agent ipmi service
tags: step2

14
docker/services/ceilometer-agent-notification.yaml
View File

@ -100,20 +100,6 @@ outputs:
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
step_5:
ceilometer_gnocchi_upgrade:
start_order: 1
image: *ceilometer_agent_notification_image
net: host
detach: false
privileged: false
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"]
upgrade_tasks:
- name: Stop and disable ceilometer agent notification service
tags: step2