stackforge/puppet-openstack
Code Issues Proposed changes

Rename the param controller_node_address

Browse Source 
The param controller_node_address in openstack::swift::proxy is
    puzzling, b/c it actually means the keystone host address,but the
    keystone_host is not always equivalent to controller_host.
    This patch rename it to the keystone_host.

Change-Id: Ia58d256370b3fa94c9f1010245f6a20395b668f1
This commit is contained in:
newptone
2013-04-27 14:52:21 +08:00
committed by Gerrit Code Review
parent 6b2e1cb59c
commit 5dbd806aa5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/swift/proxy.pp
View File

@@ -19,9 +19,16 @@ class openstack::swift::proxy (
$ratelimit_account_ratelimit = 0, $ratelimit_account_ratelimit = 0,
$package_ensure = 'present', $package_ensure = 'present',
$controller_node_address = '10.0.0.1', $controller_node_address = '10.0.0.1',
$keystone_host = '10.0.0.1',
$memcached = true $memcached = true
) { ) {
if $controller_node_address !='10.0.0.1' {
warning('The param controller_node_address has been deprecated, use keystone_host instead')
$real_keystone_host = $controller_node_address
} else {
$real_keystone_host = $keystone_host
}
class { 'swift': class { 'swift':
swift_hash_suffix => $swift_hash_suffix, swift_hash_suffix => $swift_hash_suffix,
package_ensure => $package_ensure, package_ensure => $package_ensure,
@@ -61,7 +68,7 @@ class openstack::swift::proxy (
} }
class { '::swift::proxy::s3token': class { '::swift::proxy::s3token':
auth_host => $controller_node_address, auth_host => $real_keystone_host,
auth_port => '35357', auth_port => '35357',
} }
class { '::swift::proxy::keystone': class { '::swift::proxy::keystone':
@@ -71,7 +78,7 @@ class openstack::swift::proxy (
admin_user => 'swift', admin_user => 'swift',
admin_tenant_name => 'services', admin_tenant_name => 'services',
admin_password => $swift_user_password, admin_password => $swift_user_password,
auth_host => $controller_node_address, auth_host => $real_keystone_host,
} }
# collect all of the resources that are needed # collect all of the resources that are needed