4 files changed, 7 insertions, 4 deletions
diff --git a/manifests/profile/base/swift/add_devices.pp b/manifests/profile/base/swift/add_devices.pp
index bd4c91c..909ddd6 100644
--- a/manifests/profile/base/swift/add_devices.pp
+++ b/manifests/profile/base/swift/add_devices.pp
@@ -39,7 +39,10 @@ define tripleo::profile::base::swift::add_devices(
   $zone = (($server_num%$swift_zones) + 1)
 
   # add the rings
-  $base = regsubst($name,'^r1.*-(.*)$','\1')
+  $base_notnormal = regsubst($name,'^r1.*-(.*)$','\1')
+  $ip_notnormal = regsubst($base_notnormal, ':%PORT%.*', '')
+  $ip = normalize_ip_for_uri($ip_notnormal)
+  $base = regsubst($base_notnormal, $ip_notnormal, $ip)
   $object = regsubst($base, '%PORT%', '6000')
   ring_object_device { $object:
     zone   => '1',
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index a95d05f..9d50462 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::swift::proxy (
   $memcache_port = 11211,
 ) {
   if $step >= 4 {
-    $swift_memcache_servers = suffix($memcache_servers, ":${memcache_port}")
+    $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
     include ::swift::proxy
     include ::swift::proxy::proxy_logging
     include ::swift::proxy::healthcheck
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 98a09a0..c77d744 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -91,7 +91,7 @@ class tripleo::profile::base::swift::ringbuilder (
 
       # rebalance
       swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
-        seed => 999,
+        seed => '999',
       }
 
       Ring_object_device<| |> ~> Exec['rebalance_object']
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 0b09ea6..d1660de 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -41,7 +41,7 @@ class tripleo::profile::base::swift::storage (
           ensure  => directory,
           owner   => 'swift',
           group   => 'swift',
-          require => Package['openstack-swift'],
+          require => Package['swift'],
         }
       }
       $swift_components = ['account', 'container', 'object']