diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index ce78a106c..2b79158d6 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -250,8 +250,9 @@ class openstack_integration::neutron (
 
   if $facts['os']['family'] == 'Debian' {
     $auth_url = $::openstack_integration::config::keystone_auth_uri
+    $auth_opts = "--os-auth-url ${auth_url} --os-project-name services --os-username neutron --os-identity-api-version 3"
     exec { 'check-neutron-server':
-      command     => "openstack --os-auth-url ${auth_url} --os-project-name services --os-username neutron --os-identity-api-version 3 network list",
+      command     => "openstack ${auth_opts} network list",
       environment => ['OS_PASSWORD=a_big_secret'],
       path        => '/usr/bin:/bin:/usr/sbin:/sbin',
       provider    => shell,
diff --git a/manifests/swift.pp b/manifests/swift.pp
index d8da7114e..4f3024c58 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -148,16 +148,18 @@ class openstack_integration::swift {
   include swift::ringbuilder
   # As of mitaka swift-ring-builder requires devices >= replica count
   # Default replica count is 3
-  ring_object_device { ["${::openstack_integration::config::ip_for_url}:6000/1", "${::openstack_integration::config::ip_for_url}:6000/2", "${::openstack_integration::config::ip_for_url}:6000/3"]:
-    zone   => 1,
-    weight => 1,
-  }
-  ring_container_device { ["${::openstack_integration::config::ip_for_url}:6001/1", "${::openstack_integration::config::ip_for_url}:6001/2", "${::openstack_integration::config::ip_for_url}:6001/3"]:
-    zone   => 1,
-    weight => 1,
-  }
-  ring_account_device { ["${::openstack_integration::config::ip_for_url}:6002/1", "${::openstack_integration::config::ip_for_url}:6002/2", "${::openstack_integration::config::ip_for_url}:6002/3"]:
-    zone   => 1,
-    weight => 1,
+  [1, 2, 3].each |$dev| {
+    ring_object_device { "${::openstack_integration::config::ip_for_url}:6000/${dev}":
+      zone   => 1,
+      weight => 1,
+    }
+    ring_container_device { ["${::openstack_integration::config::ip_for_url}:6001/${dev}"]:
+      zone   => 1,
+      weight => 1,
+    }
+    ring_account_device { ["${::openstack_integration::config::ip_for_url}:6002/${dev}"]:
+      zone   => 1,
+      weight => 1,
+    }
   }
 }