stackforge/puppet-openstack
Code Issues Proposed changes

Fix the swift test script deployment error

Browse Source 
* The openstack::swift::proxy use a wrong way to deploy the
    swift test script,it use a template as a file type's source.
    Instead, use swift::test_file to replace it.
      * Add new params swift_admin_tenant,swift_admin_user.

    Fixed bug#1173669
Change-Id: I40b352b577a1e4e03e3a64196e3bbec0e47651db
This commit is contained in:
newptone
2013-04-28 00:09:36 +08:00
committed by Gerrit Code Review
parent 03556cd333
commit 2d15aa2dfb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/swift/proxy.pp
View File

@@ -1,4 +1,6 @@
class openstack::swift::proxy ( class openstack::swift::proxy (
$swift_admin_tenant = 'services',
$swift_admin_user = 'swift',
$swift_user_password = 'swift_pass', $swift_user_password = 'swift_pass',
$swift_hash_suffix = 'swift_secret', $swift_hash_suffix = 'swift_secret',
$swift_local_net_ip = $::ipaddress_eth0, $swift_local_net_ip = $::ipaddress_eth0,
@@ -98,7 +100,10 @@ class openstack::swift::proxy (
} }
# deploy a script that can be used for testing # deploy a script that can be used for testing
file { '/tmp/swift_keystone_test.rb': class {'swift::test_file':
source => 'puppet:///modules/swift/swift_keystone_test.rb' auth_server => $controller_node_address,
tenant => $swift_admin_tenant,
user => $swift_admin_user,
password => $swift_user_password,
} }
} }