diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/object.yaml | 5 | ||||
| -rw-r--r-- | puppet/loadbalancer.pp | 2 | ||||
| -rw-r--r-- | puppet/overcloud_controller.pp | 25 |
5 files changed, 39 insertions, 1 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 76cde950..a75bbe39 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -1,2 +1,8 @@ # Common Hiera data gets applied to all nodes ssh::server::storeconfigs_enabled: false + +# ceilometer settings used by compute and controller ceilo auth settings +ceilometer::agent::auth::auth_region: 'regionOne' +# FIXME: Might be better to use 'service' tenant here but this requires +# changes in the tripleo-incubator keystone role setup +ceilometer::agent::auth::auth_tenant_name: 'admin' diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index b13f8234..5f326ef4 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -19,6 +19,7 @@ neutron::server::auth_tenant: 'service' neutron::agents::metadata::auth_tenant: 'service' cinder::api::keystone_tenant: 'service' swift::proxy::authtoken::admin_tenant_name: 'service' +ceilometer::api::keystone_tenant: 'service' #swift swift::proxy::pipeline: @@ -29,6 +30,7 @@ swift::proxy::pipeline: - 'tempurl' - 'formpost' - 'staticweb' + - 'ceilometer' - 'authtoken' - 'keystone' - 'proxy-logging' diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml index 759a7ba9..59a8b1cf 100644 --- a/puppet/hieradata/object.yaml +++ b/puppet/hieradata/object.yaml @@ -9,3 +9,8 @@ swift::storage::all::container_pipeline: swift::storage::all::account_pipeline: - healthcheck - account-server + +swift::proxy::keystone::operator_roles: + - admin + - swiftoperator + - ResellerAdmin diff --git a/puppet/loadbalancer.pp b/puppet/loadbalancer.pp index ea834c5e..84598da6 100644 --- a/puppet/loadbalancer.pp +++ b/puppet/loadbalancer.pp @@ -261,7 +261,7 @@ class tripleo::loadbalancer ( listening_service => 'ceilometer', ports => '8777', ipaddresses => hiera('controller_host'), - options => ['check', 'inter 2000', 'rise 2', 'fall 5'], + options => [], } } diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp index 20413cc6..90f69eb1 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/overcloud_controller.pp @@ -76,6 +76,14 @@ if hiera('step') >= 1 { dbname => $heat_dsn[6], allowed_hosts => $allowed_hosts, } + $ceilometer_dsn = split(hiera('ceilometer::db::database_connection'), '[@:/?]') + class { 'ceilometer::db::mysql': + user => $ceilometer_dsn[3], + password => $ceilometer_dsn[4], + host => $ceilometer_dsn[5], + dbname => $ceilometer_dsn[6], + allowed_hosts => $allowed_hosts, + } if $::osfamily == 'RedHat' { $rabbit_provider = 'yum' @@ -221,6 +229,7 @@ if hiera('step') >= 2 { include ::swift::proxy::keystone include ::swift::proxy::authtoken include ::swift::proxy::staticweb + include ::swift::proxy::ceilometer include ::swift::proxy::ratelimit include ::swift::proxy::catch_errors include ::swift::proxy::tempurl @@ -242,4 +251,20 @@ if hiera('step') >= 2 { swift::storage::filter::recon { $swift_components : } swift::storage::filter::healthcheck { $swift_components : } + # Ceilometer + include ::ceilometer + include ::ceilometer::api + include ::ceilometer::db + include ::ceilometer::agent::notification + include ::ceilometer::agent::central + include ::ceilometer::alarm::notifier + include ::ceilometer::alarm::evaluator + include ::ceilometer::expirer + include ::ceilometer::collector + class { 'ceilometer::agent::auth': + auth_url => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']), + } + + Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" } + } #END STEP 2 |