openstack
/
puppet-openstack_extras
Code Issues Proposed changes

Merge "Added v3 domain env variables"

This commit is contained in:
Jenkins 2016-01-25 15:17:27 +00:00 committed by Gerrit Code Review
parent ab2337f2bd 364abe6647
commit fb85b43b29
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/auth_file.pp
View File

@ -68,6 +68,15 @@
# (optional) File path
# Defaults to '/root/openrc'.
#
# [*project_domain*]
# (optional) Project domain in v3 api.
# Defaults to false
#
# [*user_domain*]
# (optional) User domain in v3 api.
# Defaults to false
#
class openstack_extras::auth_file(
$password = undef,
$auth_url = 'http://127.0.0.1:5000/v2.0/',
@ -77,6 +86,8 @@ class openstack_extras::auth_file(
$tenant_name = 'openstack',
$region_name = 'RegionOne',
$use_no_cache = true,
$project_domain = false,
$user_domain = false,
$cinder_endpoint_type = 'publicURL',
$glance_endpoint_type = 'publicURL',
$keystone_endpoint_type = 'publicURL',

4
spec/classes/openstack_extras_auth_file_spec.rb
View File

@ -44,6 +44,8 @@ describe 'openstack_extras::auth_file' do
:nova_endpoint_type => 'internalURL',
:neutron_endpoint_type => 'internalURL',
:auth_strategy => 'no_auth',
:user_domain => 'Default',
:project_domain => 'Default'
}
end
@ -58,6 +60,8 @@ describe 'openstack_extras::auth_file' do
'export OS_AUTH_URL=\'http://127.0.0.2:5000/v2.0/\'',
'export OS_AUTH_STRATEGY=\'no_auth\'',
'export OS_REGION_NAME=\'myregion\'',
'export OS_PROJECT_DOMAIN_NAME=\'Default\'',
'export OS_USER_DOMAIN_NAME=\'Default\'',
'export CINDER_ENDPOINT_TYPE=\'internalURL\'',
'export GLANCE_ENDPOINT_TYPE=\'internalURL\'',
'export KEYSTONE_ENDPOINT_TYPE=\'internalURL\'',

6
templates/openrc.erb
View File

@ -10,6 +10,12 @@ export OS_PASSWORD='<%= @password.gsub(/'/){ %q(\') } %>'
export OS_AUTH_URL='<%= @auth_url %>'
export OS_AUTH_STRATEGY='<%= @auth_strategy %>'
export OS_REGION_NAME='<%= @region_name %>'
<% if @project_domain -%>
export OS_PROJECT_DOMAIN_NAME='<%= @project_domain %>'
<% end -%>
<% if @user_domain -%>
export OS_USER_DOMAIN_NAME='<%= @user_domain %>'
<% end -%>
export CINDER_ENDPOINT_TYPE='<%= @cinder_endpoint_type %>'
export GLANCE_ENDPOINT_TYPE='<%= @glance_endpoint_type %>'
export KEYSTONE_ENDPOINT_TYPE='<%= @keystone_endpoint_type %>'