3 files changed, 41 insertions, 5 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 1e763a1..a95d05f 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -23,14 +23,27 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*memcache_servers*]
+#   (Optional) List of memcache servers
+#   Defaults to hiera('memcached_node_ips')
+#
+# [*memcache_port*]
+#   (Optional) memcache port
+#   Defaults to 11211
+#
 class tripleo::profile::base::swift::proxy (
   $step = hiera('step'),
+  $memcache_servers = hiera('memcached_node_ips'),
+  $memcache_port = 11211,
 ) {
   if $step >= 4 {
+    $swift_memcache_servers = suffix($memcache_servers, ":${memcache_port}")
     include ::swift::proxy
     include ::swift::proxy::proxy_logging
     include ::swift::proxy::healthcheck
-    include ::swift::proxy::cache
+    class { '::swift::proxy::cache':
+      memcache_servers => $swift_memcache_servers
+    }
     include ::swift::proxy::keystone
     include ::swift::proxy::authtoken
     include ::swift::proxy::staticweb
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index e0f67cd..98a09a0 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -26,7 +26,8 @@
 #   Defaults to true
 #
 #  [*devices*]
-#   (Optional) The swift devices
+#   (Optional) DEPRECATED The swift devices
+#   Should pass raw_disk_prefix, raw_disks and swift_storage_node_ips instead
 #   Defaults to ''
 #
 #  [*step*]
@@ -38,12 +39,30 @@
 #   (Optional) The swift zones
 #   Defaults to 1
 #
+#  [*raw_disk_prefix*]
+#   (Optional) Disk prefix used to create devices list
+#   Defaults to 'r1z1-'
+#
+#  [*raw_disks*]
+#   (Optional) list of raw disks in format
+#   [':%PORT%/device1', ':%PORT%/device2']
+#   Combined with raw_disk_prefix and swift_storage_node_ips
+#   to create devices list
+#   Defaults to an empty list
+#
+#  [*swift_storage_node_ips*]
+#  (Optional) list of ip addresses for nodes running swift_storage service
+#  Defaults to hiera('swift_storage_node_ips') or an empty list
+#
 class tripleo::profile::base::swift::ringbuilder (
   $replicas,
   $build_ring  = true,
-  $devices     = '',
+  $devices     = undef,
   $step        = hiera('step'),
   $swift_zones = '1',
+  $raw_disk_prefix = 'r1z1-',
+  $raw_disks = [],
+  $swift_storage_node_ips = hiera('swift_storage_node_ips', []),
 ) {
   if $step >= 2 {
     # pre-install swift here so we can build rings
@@ -54,8 +73,11 @@ class tripleo::profile::base::swift::ringbuilder (
     validate_bool($build_ring)
 
     if $build_ring {
-
-      $device_array = strip(split(rstrip($devices), ','))
+      if $devices {
+        $device_array = strip(split(rstrip($devices), ','))
+      } else {
+        $device_array = tripleo_swift_devices($raw_disk_prefix, $swift_storage_node_ips, $raw_disks)
+      }
 
       # create local rings
       swift::ringbuilder::create{ ['object', 'account', 'container']:
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 5e266a9..0b09ea6 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -34,6 +34,7 @@ class tripleo::profile::base::swift::storage (
 ) {
   if $step >= 4 {
     if $enable_swift_storage {
+      include ::swift::storage::disks
       include ::swift::storage::all
       if(!defined(File['/srv/node'])) {
         file { '/srv/node':