From b562d5445d57419b5c7d4f62bf78e2c811fad900 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Thu, 12 Sep 2013 15:56:39 -0700 Subject: [PATCH] Change default for admin_tenant in auth_file 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 --- manifests/auth_file.pp | 4 ++-- spec/classes/openstack_auth_file_spec.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp index afae919..1da1003 100644 --- a/manifests/auth_file.pp +++ b/manifests/auth_file.pp @@ -18,7 +18,7 @@ # [*admin_user*] # (optional) Defaults to 'admin'. # [*admin_tenant*] -# (optional) Defaults to 'admin'. +# (optional) Defaults to 'openstack'. # [*region_name*] # (optional) Defaults to 'RegionOne'. # [*use_no_cache*] @@ -39,7 +39,7 @@ class openstack::auth_file( $controller_node = '127.0.0.1', $keystone_admin_token = undef, $admin_user = 'admin', - $admin_tenant = 'admin', + $admin_tenant = 'openstack', $region_name = 'RegionOne', $use_no_cache = true, $cinder_endpoint_type = 'publicURL', diff --git a/spec/classes/openstack_auth_file_spec.rb b/spec/classes/openstack_auth_file_spec.rb index 3d57f98..4820fd0 100644 --- a/spec/classes/openstack_auth_file_spec.rb +++ b/spec/classes/openstack_auth_file_spec.rb @@ -11,7 +11,7 @@ describe 'openstack::auth_file' do it 'should create a openrc file' do verify_contents(subject, '/root/openrc', [ 'export OS_NO_CACHE=true', - 'export OS_TENANT_NAME=admin', + 'export OS_TENANT_NAME=openstack', 'export OS_USERNAME=admin', 'export OS_PASSWORD=admin', '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', :admin_password => 'admin', + :admin_tenant => 'admin', :keystone_admin_token => 'keystone', :cinder_endpoint_type => 'privateURL', :glance_endpoint_type => 'privateURL',