diff options
| author |   Ben Nemec <openstack@nemebean.com> | 2015-11-04 16:55:34 +0000 |
|---|---|---|
| committer | Ben Nemec <openstack@nemebean.com> | 2015-11-04 16:55:34 +0000 |
| commit | f161c8435a4ff6e3d4ed3798351092d03d2cd4ac (patch) | |
| tree | 0a1fdb8d66d1dcf973a123c569a6c031c171e791 /puppet/hieradata | |
| parent | 86d6c1ddc76bad423194e789ffb5474e4e12960e (diff) | |
Revert "Manage keystone initialization directly in t-h-t manifests"
This reverts commit 86d6c1ddc76bad423194e789ffb5474e4e12960e.
This likely has an impact on upgrades, and since we don't
have an upgrade CI job yet I'm concerned that we may have
just broken ourselves. I would prefer to wait to merge this
until the CI job is in place.
Change-Id: Ib2366cb4b40471a28122f6e9955da9bdb31a53fb
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 07bfe543..81ee7cfb 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -39,13 +39,6 @@ cinder::api::keystone_tenant: 'service' swift::proxy::authtoken::admin_tenant_name: 'service' ceilometer::api::keystone_tenant: 'service' heat::keystone_tenant: 'service' -glance::keystone::auth::tenant: 'service' -nova::keystone::auth::tenant: 'service' -neutron::keystone::auth::tenant: 'service' -cinder::keystone::auth::tenant: 'service' -swift::keystone::auth::tenant: 'service' -ceilometer::keystone::auth::tenant: 'service' -heat::keystone::auth::tenant: 'service' # keystone keystone::cron::token_flush::maxdelay: 3600 @@ -67,10 +60,6 @@ swift::proxy::pipeline: - 'proxy-server' swift::proxy::account_autocreate: true -swift::keystone::auth::configure_s3_endpoint: false -swift::keystone::auth::operator_roles: - - admin - - swiftoperator # glance glance::api::pipeline: 'keystone' @@ -88,7 +77,6 @@ nova::notify_on_state_change: 'vm_and_task_state' nova::api::default_floating_pool: 'public' nova::api::osapi_v3: true nova::scheduler::filter::ram_allocation_ratio: '1.0' -nova::keystone::auth::configure_ec2_endpoint: false # ceilometer ceilometer::agent::auth::auth_endpoint_type: 'internalURL' |