stackforge/puppet-openstack
Code Issues Proposed changes

Passes the token_driver parameter

Browse Source 
Supports the following patch:
  https://review.openstack.org/#/c/41784/

Allows the openstack module to pass the token_driver parameter
from the puppet-keystone module.

Exposes the parameter as keystone_token_driver within the
openstack::controller class so users have a better understanding
of what service the token_driver is related to.

Change-Id: Iaf7bf1375ec9ad22b014586aec19474205ca23ab
This commit is contained in:
Daneyon Hansen
2013-08-15 18:13:13 +00:00
parent 28d4f58dd6
commit cf0b5a856c
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/controller.pp
View File

@@ -17,6 +17,8 @@
# [keystone_admin_token] Admin token for keystone. # [keystone_admin_token] Admin token for keystone.
# [keystone_bind_address] Address that keystone api service should bind to. # [keystone_bind_address] Address that keystone api service should bind to.
# Optional. Defaults to '0.0.0.0'. # Optional. Defaults to '0.0.0.0'.
# [keystone_token_driver] Driver to use for managing tokens.
# Optional. Defaults to 'keystone.token.backends.sql.Token'
# [glance_registry_host] Address used by Glance API to find the Glance Registry service. # [glance_registry_host] Address used by Glance API to find the Glance Registry service.
# Optional. Defaults to '0.0.0.0'. # Optional. Defaults to '0.0.0.0'.
# [glance_db_password] Glance DB password. # [glance_db_password] Glance DB password.
@@ -174,6 +176,7 @@ class openstack::controller (
$keystone_bind_address = '0.0.0.0', $keystone_bind_address = '0.0.0.0',
$region = 'RegionOne', $region = 'RegionOne',
$public_protocol = 'http', $public_protocol = 'http',
$keystone_token_driver = 'keystone.token.backends.sql.Token',
# Glance # Glance
$glance_registry_host = '0.0.0.0', $glance_registry_host = '0.0.0.0',
$glance_db_user = 'glance', $glance_db_user = 'glance',
@@ -338,6 +341,7 @@ class openstack::controller (
admin_tenant => $keystone_admin_tenant, admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email, admin_email => $admin_email,
admin_password => $admin_password, admin_password => $admin_password,
token_driver => $keystone_token_driver,
public_address => $public_address, public_address => $public_address,
public_protocol => $public_protocol, public_protocol => $public_protocol,
internal_address => $internal_address_real, internal_address => $internal_address_real,

4
manifests/keystone.pp
View File

@@ -21,6 +21,8 @@
# [admin_tenant] Name of keystone admin tenant. Optional. Defaults to 'admin' # [admin_tenant] Name of keystone admin tenant. Optional. Defaults to 'admin'
# [verbose] Log verbosely. Optional. Defaults to false. # [verbose] Log verbosely. Optional. Defaults to false.
# [debug] Log at a debug-level. Optional. Defaults to false. # [debug] Log at a debug-level. Optional. Defaults to false.
# [token_driver] Driver to use for managing tokens.
# Optional. Defaults to 'keystone.token.backends.sql.Token'
# [bind_host] Address that keystone binds to. Optional. Defaults to '0.0.0.0' # [bind_host] Address that keystone binds to. Optional. Defaults to '0.0.0.0'
# [internal_address] Internal address for keystone. Optional. Defaults to $public_address # [internal_address] Internal address for keystone. Optional. Defaults to $public_address
# [admin_address] Keystone admin address. Optional. Defaults to $internal_address # [admin_address] Keystone admin address. Optional. Defaults to $internal_address
@@ -70,6 +72,7 @@ class openstack::keystone (
$debug = false, $debug = false,
$bind_host = '0.0.0.0', $bind_host = '0.0.0.0',
$region = 'RegionOne', $region = 'RegionOne',
$token_driver = 'keystone.token.backends.sql.Token',
$internal_address = false, $internal_address = false,
$admin_address = false, $admin_address = false,
$glance_public_address = false, $glance_public_address = false,
@@ -197,6 +200,7 @@ class openstack::keystone (
idle_timeout => $idle_timeout, idle_timeout => $idle_timeout,
catalog_type => 'sql', catalog_type => 'sql',
admin_token => $admin_token, admin_token => $admin_token,
token_driver => $token_driver,
enabled => $enabled, enabled => $enabled,
sql_connection => $sql_conn, sql_connection => $sql_conn,
} }

2
spec/classes/openstack_controller_spec.rb
View File

@@ -16,6 +16,7 @@ describe 'openstack::controller' do
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:keystone_db_password => 'keystone_pass', :keystone_db_password => 'keystone_pass',
:keystone_admin_token => 'keystone_admin_token', :keystone_admin_token => 'keystone_admin_token',
:keystone_token_driver => 'keystone.token.backends.sql.Token',
:glance_registry_host => '0.0.0.0', :glance_registry_host => '0.0.0.0',
:glance_db_password => 'glance_pass', :glance_db_password => 'glance_pass',
:glance_user_password => 'glance_pass', :glance_user_password => 'glance_pass',
@@ -196,6 +197,7 @@ describe 'openstack::controller' do
:catalog_type => 'sql', :catalog_type => 'sql',
:enabled => true, :enabled => true,
:admin_token => 'keystone_admin_token', :admin_token => 'keystone_admin_token',
:token_driver => 'keystone.token.backends.sql.Token',
: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

@@ -38,6 +38,7 @@ describe 'openstack::keystone' do
:catalog_type => 'sql', :catalog_type => 'sql',
:admin_token => 'token', :admin_token => 'token',
:enabled => true, :enabled => true,
: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'
) )
[ 'glance', 'cinder', 'neutron' ].each do |type| [ 'glance', 'cinder', 'neutron' ].each do |type|