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 "Enables support for configuring Cinder with Pure Storage FlashArray storage...
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
metrics
/
collectd.yaml
diff --git
a/puppet/services/metrics/collectd.yaml
b/puppet/services/metrics/collectd.yaml
index
a3e3b84
..
d2d9f3d
100644
(file)
--- a/
puppet/services/metrics/collectd.yaml
+++ b/
puppet/services/metrics/collectd.yaml
@@
-70,7
+70,9
@@
parameters:
CollectdSecurityLevel:
type: string
description: >
CollectdSecurityLevel:
type: string
description: >
- Security level setting for remote collectd connection.
+ Security level setting for remote collectd connection. If it is
+ set to Sign or Encrypt the CollectdPassword and CollectdUsername
+ parameters need to be set.
default: 'None'
constraints:
- allowed_values:
default: 'None'
constraints:
- allowed_values:
@@
-110,11
+112,22
@@
outputs:
step_config: |
include ::tripleo::profile::base::metrics::collectd
upgrade_tasks:
step_config: |
include ::tripleo::profile::base::metrics::collectd
upgrade_tasks:
+ - name: Check if collectd is deployed
+ command: systemctl is-enabled collectd
+ tags: common
+ ignore_errors: True
+ register: collectd_enabled
- name: Check status of collectd service
shell: >
/usr/bin/systemctl show collectd --property ActiveState |
grep '\bactive\b'
- name: Check status of collectd service
shell: >
/usr/bin/systemctl show collectd --property ActiveState |
grep '\bactive\b'
+ when: collectd_enabled.rc == 0
tags: step0,validation
- name: Stop collectd service
tags: step0,validation
- name: Stop collectd service
- tags: step2
+ tags: step1
+ when: collectd_enabled.rc == 0
service: name=collectd state=stopped
service: name=collectd state=stopped
+ - name: Install collectd package if it was disabled
+ tags: step3
+ yum: name=collectd state=latest
+ when: collectd_enabled.rc != 0