stackforge/puppet-openstack
Code Issues Proposed changes

change public_address back to controller_node

Browse Source 
To avoid breaking backwards compatibility.
This commit is contained in:
Dan Bode
2012-08-20 04:19:29 -07:00
parent e1392b36ee
commit fd305d2bb7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/auth_file.pp
View File

@@ -5,7 +5,7 @@
# #
class openstack::auth_file( class openstack::auth_file(
$admin_password, $admin_password,
$public_address = '127.0.0.1', $controller_node = '127.0.0.1',
$keystone_admin_token = 'keystone_admin_token', $keystone_admin_token = 'keystone_admin_token',
$admin_user = 'admin', $admin_user = 'admin',
$admin_tenant = 'admin' $admin_tenant = 'admin'
@@ -16,10 +16,10 @@ class openstack::auth_file(
export OS_TENANT_NAME=${admin_tenant} export OS_TENANT_NAME=${admin_tenant}
export OS_USERNAME=${admin_user} export OS_USERNAME=${admin_user}
export OS_PASSWORD=${admin_password} export OS_PASSWORD=${admin_password}
export OS_AUTH_URL=\"http://${public_address}: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 SERVICE_TOKEN=${keystone_admin_token}
export SERVICE_ENDPOINT=http://${public_address}:35357/v2.0/ export SERVICE_ENDPOINT=http://${controller_node}:35357/v2.0/
" "
} }
} }