diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-29 15:29:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-29 15:29:02 +0000 |
| commit | 52de7ade31dc033424d03a0f5f088873cd70c55c (patch) | |
| tree | fdd2425dc93401166bad1faa61ce9ea27967d516 /puppet/manifests/overcloud_controller.pp | |
| parent | 9878997b6e84ba68d1e966d61957062ae592ccd8 (diff) | |
| parent | 50ee410184369f1b2d26369e855e2ab281d12b31 (diff) | |
Merge "Convert swift storage to composable services"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 628856e6..8c14f913 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -215,24 +215,6 @@ if hiera('step') >= 4 { } } - # swift storage - 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 : } - } - # Ceilometer $ceilometer_backend = downcase(hiera('ceilometer_backend')) case $ceilometer_backend { |