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
Pass hieradata for internal TLS for RabbitMQ
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceilometer-agent-compute.yaml
diff --git
a/puppet/services/ceilometer-agent-compute.yaml
b/puppet/services/ceilometer-agent-compute.yaml
index
0004291
..
546bcd9
100644
(file)
--- a/
puppet/services/ceilometer-agent-compute.yaml
+++ b/
puppet/services/ceilometer-agent-compute.yaml
@@
-46,12
+46,20
@@
outputs:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
+ compute_namespace: true
step_config: |
step_config: |
- include ::tripleo::profile::base::ceilometer::agent::
compute
+ include ::tripleo::profile::base::ceilometer::agent::
polling
upgrade_tasks:
upgrade_tasks:
+ - name: Check if ceilometer_agent_compute is deployed
+ command: systemctl is-enabled openstack-ceilometer-compute
+ tags: common
+ ignore_errors: True
+ register: ceilometer_agent_compute_enabled
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-compute is running"
shell: /usr/bin/systemctl show 'openstack-ceilometer-compute' --property ActiveState | grep '\bactive\b'
+ when: ceilometer_agent_compute_enabled.rc == 0
tags: step0,validation
- name: Stop ceilometer_agent_compute service
tags: step0,validation
- name: Stop ceilometer_agent_compute service
- tags: step2
+ tags: step1
+ when: ceilometer_agent_compute_enabled.rc == 0
service: name=openstack-ceilometer-compute state=stopped
service: name=openstack-ceilometer-compute state=stopped