summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/gnocchi
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2016-08-05 11:54:25 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-08-08 22:44:01 +0200
commit689d80e97188342c84bb965980d48c8ed212e60d (patch)
treec155a18c188595d17007ee0f67b9b6ecd7c7af04 /manifests/profile/base/gnocchi
parentac6c502a69bef7f00633499e2d21b3ec756c21ae (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/base/gnocchi')
-rw-r--r--manifests/profile/base/gnocchi/api.pp12
-rw-r--r--manifests/profile/base/gnocchi/metricd.pp2
-rw-r--r--manifests/profile/base/gnocchi/statsd.pp2
3 files changed, 6 insertions, 10 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 870a9bb..5e7e215 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -18,22 +18,22 @@
#
# === Parameters
#
-# [*gnocchi_backend*]
-# (Optional) Gnocchi backend string file, swift or rbd
-# Defaults to swift
-#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
#
+# [*gnocchi_backend*]
+# (Optional) Gnocchi backend string file, swift or rbd
+# Defaults to swift
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
-
+#
class tripleo::profile::base::gnocchi::api (
- $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
+ $gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),
$step = hiera('step'),
) {
if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index 29cf882..4d7eb89 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
-
class tripleo::profile::base::gnocchi::metricd (
$step = hiera('step'),
) {
-
include ::tripleo::profile::base::gnocchi
if $step >= 4 {
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 830a128..775b043 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -23,11 +23,9 @@
# for more details.
# Defaults to hiera('step')
#
-
class tripleo::profile::base::gnocchi::statsd (
$step = hiera('step'),
) {
-
include ::tripleo::profile::base::gnocchi
if $step >= 4 {