stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Fix Swift Keystone Authentication Endpoints"

Browse Source
This commit is contained in:
Jenkins
2013-08-14 18:19:18 +00:00
committed by Gerrit Code Review
parent 167fe95958 ee72866fc2
commit 4fece87ecc
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/controller.pp
View File

@@ -108,7 +108,15 @@
# (Optional) Defaults to false. Required if swift is set to true. # (Optional) Defaults to false. Required if swift is set to true.
# #
# [swift_public_address] # [swift_public_address]
# The swift address used to populate the keystone service catalog. # The swift public endpoint address used to populate the keystone service catalog.
# (optional). Defaults to false.
#
# [swift_internal_address]
# The swift internal endpoint address used to populate the keystone service catalog.
# (optional). Defaults to false.
#
# [swift_admin_address]
# The swift admin endpoint address used to populate the keystone service catalog.
# (optional). Defaults to false. # (optional). Defaults to false.
# #
# === Examples # === Examples
@@ -248,6 +256,8 @@ class openstack::controller (
# swift # swift
$swift = false, $swift = false,
$swift_public_address = false, $swift_public_address = false,
$swift_internal_address = false,
$swift_admin_address = false,
$enabled = true $enabled = true
) { ) {
@@ -348,8 +358,8 @@ class openstack::controller (
swift => $swift, swift => $swift,
swift_user_password => $swift_user_password, swift_user_password => $swift_user_password,
swift_public_address => $swift_public_address, swift_public_address => $swift_public_address,
swift_internal_address => $internal_address_real, swift_internal_address => $swift_internal_address,
swift_admin_address => $admin_address_real, swift_admin_address => $swift_admin_address,
enabled => $enabled, enabled => $enabled,
bind_host => $keystone_bind_address, bind_host => $keystone_bind_address,
} }

24
spec/classes/openstack_controller_spec.rb
View File

@@ -183,9 +183,11 @@ describe 'openstack::controller' do
it 'should configure default keystone configuration' do it 'should configure default keystone configuration' do
should contain_class('openstack::keystone').with( should contain_class('openstack::keystone').with(
:swift => false, :swift => false,
:swift_user_password => false, :swift_user_password => false,
:swift_public_address => false :swift_public_address => false,
:swift_internal_address => false,
:swift_admin_address => false
) )
should contain_class('keystone').with( should contain_class('keystone').with(
@@ -228,16 +230,20 @@ describe 'openstack::controller' do
context 'when configuring swift' do context 'when configuring swift' do
before :each do before :each do
params.merge!( params.merge!(
:swift => true, :swift => true,
:swift_user_password => 'foo', :swift_user_password => 'foo',
:swift_public_address => '10.0.0.2' :swift_public_address => '10.0.0.2',
:swift_internal_address => '10.0.0.2',
:swift_admin_address => '10.0.0.2'
) )
end end
it 'should configure swift auth in keystone' do it 'should configure swift auth in keystone' do
should contain_class('openstack::keystone').with( should contain_class('openstack::keystone').with(
:swift => true, :swift => true,
:swift_user_password => 'foo', :swift_user_password => 'foo',
:swift_public_address => '10.0.0.2' :swift_public_address => '10.0.0.2',
:swift_internal_address => '10.0.0.2',
:swift_admin_address => '10.0.0.2'
) )
end end
end end