From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 21 Sep 2016 19:11:31 +0000 (-0400)
Subject: Fix Swift manifest for Puppet4 deployment
X-Git-Tag: opnfv-6.0.0~565^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=779753d415995bad55f68898deeacabf721c5fa8;p=apex-puppet-tripleo.git

Fix Swift manifest for Puppet4 deployment

1) swift/ringbuilder: seed must be a String
Because we use validate_re in puppet-swift and puppet4 requires the
regex to be a string, not an integer.

2) Fix Swift package name
In puppet4, we need the resource title, not the resource name.

Change-Id: I50cea96d45e0eb46c19040d9a7105ab72c2dbef7
---

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']