x/packstack
Code Issues Proposed changes

Change ceilometer identity to authtoken

Browse Source 
https://review.openstack.org/345789 moved keystone resource creation
to ceilometer::keystone::authtoken. Adapting packstack to it.

Change-Id: I2796d850a07ff5d258eb8af4c8107f030e7e5d4d
This commit is contained in:
Javier Pena
2016-08-25 10:29:53 +02:00
parent c449b75451
commit 87a70f5f2a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packstack/puppet/modules/packstack/manifests/ceilometer.pp
View File

@@ -63,13 +63,16 @@ class packstack::ceilometer ()
default => '0.0.0.0',
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
class { '::ceilometer::keystone::authtoken':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_CEILOMETER_KS_PW'),
} ->
class { '::ceilometer::api':
host => $bind_host,
keystone_auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_password => hiera('CONFIG_CEILOMETER_KS_PW'),
api_workers => hiera('CONFIG_SERVICE_WORKERS'),
service_name => $ceilometer_service_name,
host => $bind_host,
api_workers => hiera('CONFIG_SERVICE_WORKERS'),
service_name => $ceilometer_service_name,
}
if $ceilometer_service_name == 'httpd' {