Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "N->O upgrade, blanks ipv6 rules before activating it."
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceilometer-agent-central.yaml
diff --git
a/puppet/services/ceilometer-agent-central.yaml
b/puppet/services/ceilometer-agent-central.yaml
index
cf8a8a8
..
8082352
100644
(file)
--- a/
puppet/services/ceilometer-agent-central.yaml
+++ b/
puppet/services/ceilometer-agent-central.yaml
@@
-52,12
+52,20
@@
outputs:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer_redis_password: {get_param: RedisPassword}
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer_redis_password: {get_param: RedisPassword}
+ central_namespace: true
step_config: |
step_config: |
- include ::tripleo::profile::base::ceilometer::agent::
central
+ include ::tripleo::profile::base::ceilometer::agent::
polling
upgrade_tasks:
upgrade_tasks:
+ - name: Check if ceilometer_agent_central is deployed
+ command: systemctl is-enabled openstack-ceilometer-central
+ tags: common
+ ignore_errors: True
+ register: ceilometer_agent_central_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-central is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-central' --property ActiveState | grep '\bactive\b'
+ when: ceilometer_agent_central_enabled.rc == 0
tags: step0,validation
- name: Stop ceilometer_agent_central service
tags: step0,validation
- name: Stop ceilometer_agent_central service
- tags: step2
+ tags: step1
+ when: ceilometer_agent_central_enabled.rc == 0
service: name=openstack-ceilometer-central state=stopped
service: name=openstack-ceilometer-central state=stopped