stackforge/puppet-openstack
Code Issues Proposed changes

Add support for setting regions.

Browse Source 
This commit adds a region parameter which can be
used to set the region used for all keystone
endpoints.
This commit is contained in:
Joe Topjian
2012-10-24 10:52:28 -07:00
committed by Dan Bode
parent f001bfa157
commit 7bba3d59a0
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/controller.pp
View File

@@ -189,6 +189,7 @@ class openstack::controller (
public_address => $public_address, public_address => $public_address,
internal_address => $internal_address, internal_address => $internal_address,
admin_address => $admin_address, admin_address => $admin_address,
region => $region,
glance_user_password => $glance_user_password, glance_user_password => $glance_user_password,
nova_user_password => $nova_user_password, nova_user_password => $nova_user_password,
cinder => $cinder, cinder => $cinder,

6
manifests/keystone.pp
View File

@@ -54,6 +54,7 @@ class openstack::keystone (
$admin_tenant = 'admin', $admin_tenant = 'admin',
$verbose = 'False', $verbose = 'False',
$bind_host = '0.0.0.0', $bind_host = '0.0.0.0',
$region = 'RegionOne',
$internal_address = false, $internal_address = false,
$admin_address = false, $admin_address = false,
$glance_public_address = false, $glance_public_address = false,
@@ -177,6 +178,7 @@ class openstack::keystone (
public_address => $public_address, public_address => $public_address,
admin_address => $admin_real, admin_address => $admin_real,
internal_address => $internal_real, internal_address => $internal_real,
region => $region,
} }
# Configure Glance endpoint in Keystone # Configure Glance endpoint in Keystone
@@ -186,6 +188,7 @@ class openstack::keystone (
public_address => $glance_public_real, public_address => $glance_public_real,
admin_address => $glance_admin_real, admin_address => $glance_admin_real,
internal_address => $glance_internal_real, internal_address => $glance_internal_real,
region => $region,
} }
} }
@@ -196,6 +199,7 @@ class openstack::keystone (
public_address => $nova_public_real, public_address => $nova_public_real,
admin_address => $nova_admin_real, admin_address => $nova_admin_real,
internal_address => $nova_internal_real, internal_address => $nova_internal_real,
region => $region,
} }
} }
@@ -206,6 +210,7 @@ class openstack::keystone (
public_address => $cinder_public_real, public_address => $cinder_public_real,
admin_address => $cinder_admin_real, admin_address => $cinder_admin_real,
internal_address => $cinder_internal_real, internal_address => $cinder_internal_real,
region => $region,
} }
} }
if $quantum { if $quantum {
@@ -214,6 +219,7 @@ class openstack::keystone (
public_address => $quantum_public_real, public_address => $quantum_public_real,
admin_address => $quantum_admin_real, admin_address => $quantum_admin_real,
internal_address => $quantum_internal_real, internal_address => $quantum_internal_real,
region => $region,
} }
} }
} }