diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-09-21 15:11:31 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-09-21 16:31:39 -0400 |
| commit | 779753d415995bad55f68898deeacabf721c5fa8 (patch) | |
| tree | 3ddf6da94f54253bb5f25804fc72291a75dd475d | |
| parent | 9b974df7a2a20741b64b72e8980bc47c13b6166c (diff) | |
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
| -rw-r--r-- | manifests/profile/base/swift/ringbuilder.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/swift/storage.pp | 2 |
2 files changed, 2 insertions, 2 deletions
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'] |