diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-19 11:02:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-19 11:02:00 +0000 |
| commit | b078fcd39c414d1f897ae559ea11a0ce4b6b9c25 (patch) | |
| tree | de92ab4b429a5c910905a2677b7e6a933cd992da | |
| parent | 3031f1c5b17dfdae451d7e16fb60a4f51ab750fa (diff) | |
| parent | 555e6acc0351eaecf9640ea38632b450d2568396 (diff) | |
Merge "Include ::swift::config in Swift API and Storage roles"
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/swift/storage.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 8cb1132..feabf86 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'])) { |