stackforge/puppet-openstack-cloud
Code Issues Proposed changes

identity: update deprecated parameters

Browse Source 
Some puppet-keystone parameters are now deprecated, let's update them.

Change-Id: I770a58996ea790a6a8a0ca5c16aea7e8ed25dfc6
This commit is contained in:
Emilien Macchi
2015-01-19 11:50:38 -05:00
parent ceceaac1b2
commit 3905c73166
2 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
manifests/identity.pp
View File

@@ -385,7 +385,7 @@
#
# [*token_driver*]
# (optional) Driver to store tokens
# Defaults to 'keystone.token.backends.sql.Token'
# Defaults to 'keystone.token.persistence.backends.sql.Token'
#
# [*token_expiration*]
# (optional) Amount of time a token should remain valid (in seconds)
@@ -509,7 +509,7 @@ class cloud::identity (
$log_facility = 'LOG_LOCAL0',
$use_syslog = true,
$ks_token_expiration = 3600,
$token_driver = 'keystone.token.backends.sql.Token',
$token_driver = 'keystone.token.persistence.backends.sql.Token',
$firewall_settings = {},
){
@@ -532,27 +532,26 @@ class cloud::identity (
# Configure Keystone
class { 'keystone':
enabled => true,
admin_token => $ks_admin_token,
compute_port => $ks_nova_public_port,
debug => $debug,
idle_timeout => 60,
log_facility => $log_facility,
sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone?charset=utf8",
mysql_module => '2.2',
token_provider => 'keystone.token.providers.uuid.Provider',
use_syslog => $use_syslog,
verbose => $verbose,
bind_host => $api_eth,
log_dir => $log_dir,
log_file => $log_file,
public_port => $ks_keystone_public_port,
admin_port => $ks_keystone_admin_port,
token_driver => $token_driver,
token_expiration => $ks_token_expiration,
admin_endpoint => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/",
public_endpoint => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/",
validate_service => true,
enabled => true,
admin_token => $ks_admin_token,
compute_port => $ks_nova_public_port,
debug => $debug,
database_idle_timeout => 60,
log_facility => $log_facility,
database_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone?charset=utf8",
token_provider => 'keystone.token.providers.uuid.Provider',
use_syslog => $use_syslog,
verbose => $verbose,
bind_host => $api_eth,
log_dir => $log_dir,
log_file => $log_file,
public_port => $ks_keystone_public_port,
admin_port => $ks_keystone_admin_port,
token_driver => $token_driver,
token_expiration => $ks_token_expiration,
admin_endpoint => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/",
public_endpoint => "${ks_keystone_public_proto}://${ks_keystone_public_host}:${ks_keystone_public_port}/",
validate_service => true,
}
keystone_config {

40
spec/classes/cloud_identity_spec.rb
View File

@@ -112,32 +112,32 @@ describe 'cloud::identity' do
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:token_driver => 'keystone.token.backends.sql.Token',
:token_driver => 'keystone.token.persistence.backends.sql.Token',
:ks_token_expiration => '3600',
:api_eth => '10.0.0.1' }
end
it 'configure keystone server' do
is_expected.to contain_class('keystone').with(
:enabled => true,
:admin_token => 'SECRETE',
:compute_port => '8774',
:debug => true,
:verbose => true,
:idle_timeout => '60',
:log_facility => 'LOG_LOCAL0',
:sql_connection => 'mysql://keystone:secrete@10.0.0.1/keystone?charset=utf8',
:token_driver => 'keystone.token.backends.sql.Token',
:token_provider => 'keystone.token.providers.uuid.Provider',
:use_syslog => true,
:bind_host => '10.0.0.1',
:public_port => '5000',
:admin_port => '35357',
:token_expiration => '3600',
:log_dir => false,
:log_file => false,
:admin_endpoint => 'https://10.0.0.1:35357/',
:public_endpoint => 'https://10.0.0.1:5000/'
:enabled => true,
:admin_token => 'SECRETE',
:compute_port => '8774',
:debug => true,
:verbose => true,
:database_idle_timeout => '60',
:log_facility => 'LOG_LOCAL0',
:database_connection => 'mysql://keystone:secrete@10.0.0.1/keystone?charset=utf8',
:token_driver => 'keystone.token.persistence.backends.sql.Token',
:token_provider => 'keystone.token.providers.uuid.Provider',
:use_syslog => true,
:bind_host => '10.0.0.1',
:public_port => '5000',
:admin_port => '35357',
:token_expiration => '3600',
:log_dir => false,
:log_file => false,
:admin_endpoint => 'https://10.0.0.1:35357/',
:public_endpoint => 'https://10.0.0.1:5000/'
)
is_expected.to contain_exec('validate_keystone_connection')
is_expected.to contain_keystone_config('ec2/driver').with('value' => 'keystone.contrib.ec2.backends.sql.Ec2')