From 5dbd806aa52fa1cf6dfdf5014e0fcd4315d5a034 Mon Sep 17 00:00:00 2001
From: newptone <yuxcer@gmail.com>
Date: Sat, 27 Apr 2013 14:52:21 +0800
Subject: [PATCH] Rename the param controller_node_address

    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
---
 manifests/swift/proxy.pp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/manifests/swift/proxy.pp b/manifests/swift/proxy.pp
index 327f3a5..c0b66ba 100644
--- a/manifests/swift/proxy.pp
+++ b/manifests/swift/proxy.pp
@@ -19,10 +19,17 @@ class openstack::swift::proxy (
   $ratelimit_account_ratelimit      = 0,
   $package_ensure                   = 'present',
   $controller_node_address          = '10.0.0.1',
+  $keystone_host                    = '10.0.0.1',
   $memcached                        = true
 ) {
 
-  class { 'swift': 
+  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':
     swift_hash_suffix => $swift_hash_suffix,
     package_ensure    => $package_ensure,
   }
@@ -61,7 +68,7 @@ class openstack::swift::proxy (
   }
 
   class { '::swift::proxy::s3token':
-    auth_host     => $controller_node_address,
+    auth_host     => $real_keystone_host,
     auth_port     => '35357',
   }
   class { '::swift::proxy::keystone':
@@ -71,7 +78,7 @@ class openstack::swift::proxy (
     admin_user        => 'swift',
     admin_tenant_name => 'services',
     admin_password    => $swift_user_password,
-    auth_host         => $controller_node_address,
+    auth_host         => $real_keystone_host,
   }
 
   # collect all of the resources that are needed