diff options
Diffstat (limited to 'manifests/profile/base/gnocchi')
-rw-r--r-- | manifests/profile/base/gnocchi/api.pp | 12 | ||||
-rw-r--r-- | manifests/profile/base/gnocchi/metricd.pp | 2 | ||||
-rw-r--r-- | manifests/profile/base/gnocchi/statsd.pp | 2 |
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 { |