aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-04-10 22:14:44 -0400
committerDan Prince <dprince@redhat.com>2015-04-21 09:14:03 -0400
commit9a1c402343a73e9442768e1864ed6a36c9bca3f6 (patch)
treeef87b14039c0058d695c9e1d7dc1cc430880f677 /puppet/manifests
parentbf466bcd5189495be9783366440dbe2c3db1ef3d (diff)
Parameter to enable/disable controller swift store
Adds a new ControllerEnableSwiftStorage parameter that can be used to enable/disable use of the contoller node as a Swift storage node. Change-Id: Ic54144f4a46a671818c2f12e419cfa619b0dc1f9
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp26
1 files changed, 14 insertions, 12 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index caf9fcf5..b1ccf3d7 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -367,20 +367,22 @@ if hiera('step') >= 3 {
include ::swift::proxy::formpost
# swift storage
- class {'swift::storage::all':
- mount_check => str2bool(hiera('swift_mount_check'))
- }
- if(!defined(File['/srv/node'])) {
- file { '/srv/node':
- ensure => directory,
- owner => 'swift',
- group => 'swift',
- require => Package['openstack-swift'],
+ if str2bool(hiera('enable_swift_storage', 'true')) {
+ class {'swift::storage::all':
+ mount_check => str2bool(hiera('swift_mount_check'))
}
+ if(!defined(File['/srv/node'])) {
+ file { '/srv/node':
+ ensure => directory,
+ owner => 'swift',
+ group => 'swift',
+ require => Package['openstack-swift'],
+ }
+ }
+ $swift_components = ['account', 'container', 'object']
+ swift::storage::filter::recon { $swift_components : }
+ swift::storage::filter::healthcheck { $swift_components : }
}
- $swift_components = ['account', 'container', 'object']
- swift::storage::filter::recon { $swift_components : }
- swift::storage::filter::healthcheck { $swift_components : }
# Ceilometer
include ::ceilometer