aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-10-07 14:57:01 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-10-07 14:57:01 +0200
commit555e6acc0351eaecf9640ea38632b450d2568396 (patch)
tree6ac68ea5340892e9c7ce2bc77146b5f3042b9e97
parent5ac7ec551b76bc8c2b6de2281f7d86591f192f23 (diff)
Include ::swift::config in Swift API and Storage roles
This changes makes the Swift API and Storage roles to include the ::swift::config class, as we do for the other OpenStack services, which is useful to push arbitrary config settings into Swift. Change-Id: Iaf2c2f0f0103fe9264ce875099a1578b353a5558
-rw-r--r--manifests/profile/base/swift/proxy.pp1
-rw-r--r--manifests/profile/base/swift/storage.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index fc9fe11..321dccd 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -38,6 +38,7 @@ class tripleo::profile::base::swift::proxy (
) {
if $step >= 4 {
$swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
+ include ::swift::config
include ::swift::proxy
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index d1660de..568be66 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::config
include ::swift::storage::disks
include ::swift::storage::all
if(!defined(File['/srv/node'])) {