aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/ceilometer.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-26 17:04:46 +0000
committerGerrit Code Review <review@openstack.org>2017-05-26 17:04:46 +0000
commit09b9b70c5d64608d7d8432aa371f537ce3bdef25 (patch)
tree7a5e8b7d2faa743484694494451395ea26f9f5a1 /manifests/profile/base/ceilometer.pp
parent019efc9378f5b928c80dae11dc7e74ab6171e009 (diff)
parentdaf64974d89db6bffe1fd99b344b18d682d9f237 (diff)
Merge "Move ceilometer upgrade step out of base"
Diffstat (limited to 'manifests/profile/base/ceilometer.pp')
-rw-r--r--manifests/profile/base/ceilometer.pp19
1 files changed, 0 insertions, 19 deletions
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index e6a2f11..a85be5d 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -18,10 +18,6 @@
#
# === Parameters
#
-# [*bootstrap_node*]
-# (Optional) The hostname of the node responsible for bootstrapping tasks
-# Defaults to hiera('bootstrap_nodeid')
-#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@@ -72,7 +68,6 @@
# Defaults to hiera('ceilometer::rabbit_use_ssl', '0')
class tripleo::profile::base::ceilometer (
- $bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
@@ -86,11 +81,6 @@ class tripleo::profile::base::ceilometer (
$oslomsg_notify_username = hiera('ceilometer::rabbit_userid', 'guest'),
$oslomsg_use_ssl = hiera('ceilometer::rabbit_use_ssl', '0'),
) {
- if $::hostname == downcase($bootstrap_node) {
- $sync_db = true
- } else {
- $sync_db = false
- }
if $step >= 3 {
$oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
@@ -114,13 +104,4 @@ class tripleo::profile::base::ceilometer (
}
include ::ceilometer::config
}
-
- # Run ceilometer-upgrade in step 5 so gnocchi resource types
- # are created safely.
- if $step >= 5 and $sync_db {
- exec {'ceilometer-db-upgrade':
- command => 'ceilometer-upgrade --skip-metering-database',
- path => ['/usr/bin', '/usr/sbin'],
- }
- }
}