stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Add ceilometer support to keystone configuration."

Browse Source
This commit is contained in:
Jenkins
2013-09-05 06:39:06 +00:00
committed by Gerrit Code Review
parent 6e717eb6f5 08830e64d5
commit 76836baf0c
1 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/keystone.pp
View File

@@ -67,6 +67,7 @@ class openstack::keystone (
$db_host = '127.0.0.1', $db_host = '127.0.0.1',
$idle_timeout = '200', $idle_timeout = '200',
$swift_user_password = false, $swift_user_password = false,
$ceilometer_user_password = false,
$db_type = 'mysql', $db_type = 'mysql',
$db_user = 'keystone', $db_user = 'keystone',
$db_name = 'keystone', $db_name = 'keystone',
@@ -90,6 +91,9 @@ class openstack::keystone (
$neutron_public_address = false, $neutron_public_address = false,
$neutron_internal_address = false, $neutron_internal_address = false,
$neutron_admin_address = false, $neutron_admin_address = false,
$ceilometer_public_address = false,
$ceilometer_internal_address = false,
$ceilometer_admin_address = false,
$swift_public_address = false, $swift_public_address = false,
$swift_internal_address = false, $swift_internal_address = false,
$swift_admin_address = false, $swift_admin_address = false,
@@ -97,6 +101,7 @@ class openstack::keystone (
$nova = true, $nova = true,
$cinder = true, $cinder = true,
$neutron = true, $neutron = true,
$ceilometer = false,
$swift = false, $swift = false,
$enabled = true $enabled = true
) { ) {
@@ -180,6 +185,21 @@ class openstack::keystone (
} else { } else {
$neutron_admin_real = $neutron_internal_real $neutron_admin_real = $neutron_internal_real
} }
if($ceilometer_public_address) {
$ceilometer_public_real = $ceilometer_public_address
} else {
$ceilometer_public_real = $public_address
}
if($ceilometer_internal_address) {
$ceilometer_internal_real = $ceilometer_internal_address
} else {
$ceilometer_internal_real = $ceilometer_public_real
}
if($ceilometer_admin_address) {
$ceilometer_admin_real = $ceilometer_admin_address
} else {
$ceilometer_admin_real = $ceilometer_internal_real
}
if($swift_public_address) { if($swift_public_address) {
$swift_public_real = $swift_public_address $swift_public_real = $swift_public_address
} else { } else {
@@ -250,7 +270,7 @@ class openstack::keystone (
} }
} }
# Configure Nova endpoint in Keystone # Configure Cinder endpoint in Keystone
if $cinder { if $cinder {
class { 'cinder::keystone::auth': class { 'cinder::keystone::auth':
password => $cinder_user_password, password => $cinder_user_password,
@@ -261,6 +281,7 @@ class openstack::keystone (
region => $region, region => $region,
} }
} }
if $neutron { if $neutron {
class { 'neutron::keystone::auth': class { 'neutron::keystone::auth':
password => $neutron_user_password, password => $neutron_user_password,
@@ -272,6 +293,22 @@ class openstack::keystone (
} }
} }
if $ceilometer {
if ! $ceilometer_user_password {
fail('Must set a ceilometer_user_password when ceilometer auth is being configured')
}
class { 'ceilometer::keystone::auth':
password => $ceilometer_user_password,
public_address => $ceilometer_public_real,
public_protocol => $public_protocol,
admin_address => $ceilometer_admin_real,
internal_address => $ceilometer_internal_real,
region => $region,
}
}
if $swift { if $swift {
if ! $swift_user_password { if ! $swift_user_password {