stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Fix Keystone 'token-get' Error"

Browse Source
This commit is contained in:
Jenkins
2013-08-02 01:51:59 +00:00
committed by Gerrit Code Review
parent 217ed97692 8b37baa366
commit 33a89e6f3f
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/auth_file.pp
View File

@@ -4,13 +4,24 @@
# against a keystone server. # against a keystone server.
# #
class openstack::auth_file( class openstack::auth_file(
$admin_password,
$controller_node = '127.0.0.1', $controller_node = '127.0.0.1',
$keystone_admin_token = 'keystone_admin_token', $keystone_admin_token = undef,
$admin_user = 'admin', $admin_user = 'admin',
$admin_password = undef,
$admin_tenant = 'admin', $admin_tenant = 'admin',
$region_name = 'RegionOne',
$use_no_cache = true $use_no_cache = true
) { ) {
if ($keystone_admin_token) {
file { '/root/openrc':
content =>
"
export OS_SERVICE_TOKEN=${keystone_admin_token}
export OS_SERVICE_ENDPOINT=http://${controller_node}:35357/v2.0/
"
}
} else {
file { '/root/openrc': file { '/root/openrc':
content => content =>
" "
@@ -20,8 +31,8 @@ class openstack::auth_file(
export OS_PASSWORD='${admin_password}' export OS_PASSWORD='${admin_password}'
export OS_AUTH_URL=\"http://${controller_node}:5000/v2.0/\" export OS_AUTH_URL=\"http://${controller_node}:5000/v2.0/\"
export OS_AUTH_STRATEGY=keystone export OS_AUTH_STRATEGY=keystone
export SERVICE_TOKEN=${keystone_admin_token} export OS_REGION_NAME=${region_name}
export SERVICE_ENDPOINT=http://${controller_node}:35357/v2.0/
" "
} }
}
} }

19
spec/classes/openstack_auth_file_spec.rb
View File

@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'openstack::auth_file' do describe 'openstack::auth_file' do
describe "when only passing required class parameters" do describe "when only passing default class parameters" do
let :params do let :params do
{ :admin_password => 'admin' } { :admin_password => 'admin' }
@@ -17,8 +17,7 @@ describe 'openstack::auth_file' do
export OS_PASSWORD=\'admin\' export OS_PASSWORD=\'admin\'
export OS_AUTH_URL="http://127.0.0.1:5000/v2.0/" export OS_AUTH_URL="http://127.0.0.1:5000/v2.0/"
export OS_AUTH_STRATEGY=keystone export OS_AUTH_STRATEGY=keystone
export SERVICE_TOKEN=keystone_admin_token export OS_REGION_NAME=RegionOne
export SERVICE_ENDPOINT=http://127.0.0.1:35357/v2.0/
' '
) )
end end
@@ -28,26 +27,16 @@ describe 'openstack::auth_file' do
let :params do let :params do
{ {
:admin_password => 'nova',
:controller_node => '127.0.0.2', :controller_node => '127.0.0.2',
:keystone_admin_token => 'keystone', :keystone_admin_token => 'keystone',
:admin_user => 'nova',
:admin_tenant => 'nova',
:use_no_cache => false,
} }
end end
it 'should create a openrc file' do it 'should create a openrc file' do
should contain_file('/root/openrc').with_content( should contain_file('/root/openrc').with_content(
' '
export OS_NO_CACHE=false export OS_SERVICE_TOKEN=keystone
export OS_TENANT_NAME=nova export OS_SERVICE_ENDPOINT=http://127.0.0.2:35357/v2.0/
export OS_USERNAME=nova
export OS_PASSWORD=\'nova\'
export OS_AUTH_URL="http://127.0.0.2:5000/v2.0/"
export OS_AUTH_STRATEGY=keystone
export SERVICE_TOKEN=keystone
export SERVICE_ENDPOINT=http://127.0.0.2:35357/v2.0/
' '
) )
end end