stackforge/puppet-openstack
Code Issues Proposed changes

Change default for admin_tenant in auth_file

Browse Source 
Currently, the tenant for the auth_file class
is set to admin by default which is inconsistent with
the default set by the keystone::roles::admin class of
openstack.

This commit updates the default value to make it more consistent.

Change-Id: I6c61794b182006d3a43212ef3e2f85c660d37831
This commit is contained in:
Dan Bode
2013-09-12 15:56:39 -07:00
parent f4d469e92b
commit b562d5445d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/auth_file.pp
View File

@@ -18,7 +18,7 @@
# [*admin_user*] # [*admin_user*]
# (optional) Defaults to 'admin'. # (optional) Defaults to 'admin'.
# [*admin_tenant*] # [*admin_tenant*]
# (optional) Defaults to 'admin'. # (optional) Defaults to 'openstack'.
# [*region_name*] # [*region_name*]
# (optional) Defaults to 'RegionOne'. # (optional) Defaults to 'RegionOne'.
# [*use_no_cache*] # [*use_no_cache*]
@@ -39,7 +39,7 @@ class openstack::auth_file(
$controller_node = '127.0.0.1', $controller_node = '127.0.0.1',
$keystone_admin_token = undef, $keystone_admin_token = undef,
$admin_user = 'admin', $admin_user = 'admin',
$admin_tenant = 'admin', $admin_tenant = 'openstack',
$region_name = 'RegionOne', $region_name = 'RegionOne',
$use_no_cache = true, $use_no_cache = true,
$cinder_endpoint_type = 'publicURL', $cinder_endpoint_type = 'publicURL',

3
spec/classes/openstack_auth_file_spec.rb
View File

@@ -11,7 +11,7 @@ describe 'openstack::auth_file' do
it 'should create a openrc file' do it 'should create a openrc file' do
verify_contents(subject, '/root/openrc', [ verify_contents(subject, '/root/openrc', [
'export OS_NO_CACHE=true', 'export OS_NO_CACHE=true',
'export OS_TENANT_NAME=admin', 'export OS_TENANT_NAME=openstack',
'export OS_USERNAME=admin', 'export OS_USERNAME=admin',
'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/',
@@ -32,6 +32,7 @@ describe 'openstack::auth_file' do
{ {
:controller_node => '127.0.0.2', :controller_node => '127.0.0.2',
:admin_password => 'admin', :admin_password => 'admin',
:admin_tenant => 'admin',
:keystone_admin_token => 'keystone', :keystone_admin_token => 'keystone',
:cinder_endpoint_type => 'privateURL', :cinder_endpoint_type => 'privateURL',
:glance_endpoint_type => 'privateURL', :glance_endpoint_type => 'privateURL',