openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Include ::swift::config in Swift API and Storage roles"

Browse Source
This commit is contained in:
Jenkins
2016-10-19 11:02:00 +00:00
committed by Gerrit Code Review
parent 3031f1c5b1 555e6acc03
commit b078fcd39c
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/swift/proxy.pp
View File

@@ -38,6 +38,7 @@ class tripleo::profile::base::swift::proxy (
) { ) {
if $step >= 4 { if $step >= 4 {
$swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}") $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
include ::swift::config
include ::swift::proxy include ::swift::proxy
include ::swift::proxy::proxy_logging include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck include ::swift::proxy::healthcheck

1
manifests/profile/base/swift/storage.pp
View File

@@ -34,6 +34,7 @@ class tripleo::profile::base::swift::storage (
) { ) {
if $step >= 4 { if $step >= 4 {
if $enable_swift_storage { if $enable_swift_storage {
include ::swift::config
include ::swift::storage::disks include ::swift::storage::disks
include ::swift::storage::all include ::swift::storage::all
if(!defined(File['/srv/node'])) { if(!defined(File['/srv/node'])) {