stackforge/puppet-openstack
Code Issues Proposed changes

Passes the Keystone token_format Parameter

Browse Source 
Previously, the openstack module did not support managing the
Keystone token_format.

Adds the token_format parameter for managing Keystone auth tokens
as either PKI or UUID.  Defaults to PKI for backwards
compatibility.

Change-Id: I6a88fbeac78b3f8b1116db74e18004251a2e5bcf
This commit is contained in:
Daneyon Hansen
2013-08-20 21:32:35 +00:00
committed by Mark T. Voelker
parent cf0b5a856c
commit 974dfdd733
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/controller.pp
View File

@@ -6,6 +6,8 @@
# [public_interface] Public interface used to route public traffic. Required. # [public_interface] Public interface used to route public traffic. Required.
# [public_address] Public address for public endpoints. Required. # [public_address] Public address for public endpoints. Required.
# [public_protocol] Protocol used by public endpoints. Defaults to 'http' # [public_protocol] Protocol used by public endpoints. Defaults to 'http'
# [token_format] Format keystone uses for tokens. Optional. Defaults to PKI.
# Supports PKI and UUID.
# [private_interface] Interface used for vm networking connectivity. Required. # [private_interface] Interface used for vm networking connectivity. Required.
# [internal_address] Internal address used for management. Required. # [internal_address] Internal address used for management. Required.
# [mysql_root_password] Root password for mysql server. # [mysql_root_password] Root password for mysql server.
@@ -177,6 +179,7 @@ class openstack::controller (
$region = 'RegionOne', $region = 'RegionOne',
$public_protocol = 'http', $public_protocol = 'http',
$keystone_token_driver = 'keystone.token.backends.sql.Token', $keystone_token_driver = 'keystone.token.backends.sql.Token',
$token_format = 'PKI',
# Glance # Glance
$glance_registry_host = '0.0.0.0', $glance_registry_host = '0.0.0.0',
$glance_db_user = 'glance', $glance_db_user = 'glance',
@@ -344,6 +347,7 @@ class openstack::controller (
token_driver => $keystone_token_driver, token_driver => $keystone_token_driver,
public_address => $public_address, public_address => $public_address,
public_protocol => $public_protocol, public_protocol => $public_protocol,
token_format => $token_format,
internal_address => $internal_address_real, internal_address => $internal_address_real,
admin_address => $admin_address_real, admin_address => $admin_address_real,
region => $region, region => $region,

4
manifests/keystone.pp
View File

@@ -15,6 +15,8 @@
# [nova_user_password] Auth password for nova user. Required. # [nova_user_password] Auth password for nova user. Required.
# [public_address] Public address where keystone can be accessed. Required. # [public_address] Public address where keystone can be accessed. Required.
# [public_protocol] Public protocol over which keystone can be accessed. Defaults to 'http' # [public_protocol] Public protocol over which keystone can be accessed. Defaults to 'http'
# [token_format] Format keystone uses for tokens. Optional. Defaults to PKI.
# Supports PKI and UUID.
# [db_type] Type of DB used. Currently only supports mysql. Optional. Defaults to 'mysql' # [db_type] Type of DB used. Currently only supports mysql. Optional. Defaults to 'mysql'
# [db_user] Name of keystone db user. Optional. Defaults to 'keystone' # [db_user] Name of keystone db user. Optional. Defaults to 'keystone'
# [db_name] Name of keystone DB. Optional. Defaults to 'keystone' # [db_name] Name of keystone DB. Optional. Defaults to 'keystone'
@@ -61,6 +63,7 @@ class openstack::keystone (
$neutron_user_password, $neutron_user_password,
$public_address, $public_address,
$public_protocol = 'http', $public_protocol = 'http',
$token_format = 'PKI',
$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,
@@ -201,6 +204,7 @@ class openstack::keystone (
catalog_type => 'sql', catalog_type => 'sql',
admin_token => $admin_token, admin_token => $admin_token,
token_driver => $token_driver, token_driver => $token_driver,
token_format => $token_format,
enabled => $enabled, enabled => $enabled,
sql_connection => $sql_conn, sql_connection => $sql_conn,
} }

1
spec/classes/openstack_controller_spec.rb
View File

@@ -198,6 +198,7 @@ describe 'openstack::controller' do
:enabled => true, :enabled => true,
:admin_token => 'keystone_admin_token', :admin_token => 'keystone_admin_token',
:token_driver => 'keystone.token.backends.sql.Token', :token_driver => 'keystone.token.backends.sql.Token',
:token_format => 'PKI',
:sql_connection => "mysql://keystone:keystone_pass@127.0.0.1/keystone" :sql_connection => "mysql://keystone:keystone_pass@127.0.0.1/keystone"
) )

1
spec/classes/openstack_keystone_spec.rb
View File

@@ -37,6 +37,7 @@ describe 'openstack::keystone' do
:idle_timeout => '200', :idle_timeout => '200',
:catalog_type => 'sql', :catalog_type => 'sql',
:admin_token => 'token', :admin_token => 'token',
:token_format => 'PKI',
:enabled => true, :enabled => true,
:token_driver => 'keystone.token.backends.sql.Token', :token_driver => 'keystone.token.backends.sql.Token',
:sql_connection => 'mysql://keystone:pass@127.0.0.1/keystone' :sql_connection => 'mysql://keystone:pass@127.0.0.1/keystone'