diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-08-05 11:54:25 +0200 |
|---|---|---|
| committer | Carlos Camacho <ccamacho@redhat.com> | 2016-08-08 22:44:01 +0200 |
| commit | 689d80e97188342c84bb965980d48c8ed212e60d (patch) | |
| tree | c155a18c188595d17007ee0f67b9b6ecd7c7af04 /manifests/profile/pacemaker/ceilometer | |
| parent | ac6c502a69bef7f00633499e2d21b3ec756c21ae (diff) | |
Fix parameters and headers inconsistency in the puppet manifests.
As we are staring to manually check overcloud services
the first step is to check that the puppet profiles
are all aligned.
Changes applied:
No logic added or removed in this submission.
Removed unused parameters.
Align header comments structure.
All profiles parameters sorted following:
"Mandatory params first sorted alphabetically
then optional params sorted alphabetically."
Note: Following submissions will check pacemaker,
cinder, mistral and redis services in the base profiles
as some of them has the $pacemaker_master parameter
defaulted to true.
Change-Id: I2f91c3f6baa33f74b5625789eec83233179a9655
Diffstat (limited to 'manifests/profile/pacemaker/ceilometer')
4 files changed, 0 insertions, 10 deletions
diff --git a/manifests/profile/pacemaker/ceilometer/agent/central.pp b/manifests/profile/pacemaker/ceilometer/agent/central.pp index e227614..90266be 100644 --- a/manifests/profile/pacemaker/ceilometer/agent/central.pp +++ b/manifests/profile/pacemaker/ceilometer/agent/central.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::agent::central ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::agent::central diff --git a/manifests/profile/pacemaker/ceilometer/agent/notification.pp b/manifests/profile/pacemaker/ceilometer/agent/notification.pp index 868bb22..e419356 100644 --- a/manifests/profile/pacemaker/ceilometer/agent/notification.pp +++ b/manifests/profile/pacemaker/ceilometer/agent/notification.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::agent::notification ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::agent::notification diff --git a/manifests/profile/pacemaker/ceilometer/api.pp b/manifests/profile/pacemaker/ceilometer/api.pp index 3006be8..0eddaec 100644 --- a/manifests/profile/pacemaker/ceilometer/api.pp +++ b/manifests/profile/pacemaker/ceilometer/api.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::api ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::api diff --git a/manifests/profile/pacemaker/ceilometer/collector.pp b/manifests/profile/pacemaker/ceilometer/collector.pp index 6610a07..d0f7217 100644 --- a/manifests/profile/pacemaker/ceilometer/collector.pp +++ b/manifests/profile/pacemaker/ceilometer/collector.pp @@ -27,19 +27,12 @@ # for more details. # Defaults to hiera('step') # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to undef -# class tripleo::profile::pacemaker::ceilometer::collector ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), - $sync_db = true, ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer - include ::tripleo::profile::base::ceilometer::collector if $step >= 5 and downcase($::hostname) == $pacemaker_master { |