diff options
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/object.yaml | 5 |
3 files changed, 13 insertions, 0 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 |