diff options
Diffstat (limited to 'puppet/overcloud_controller.pp')
-rw-r--r-- | puppet/overcloud_controller.pp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp index 4c1306f2..b766dc50 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/overcloud_controller.pp @@ -117,6 +117,9 @@ if hiera('step') >= 1 { provider => 'rabbitmqctl', } + # pre-install swift here so we can build rings + include ::swift + } #END STEP 1 if hiera('step') >= 2 { @@ -206,4 +209,34 @@ if hiera('step') >= 2 { size => join([hiera('cinder_lvm_loop_device_size'), 'M']), } + # swift proxy + include ::memcached + include ::swift::proxy + include ::swift::proxy::proxy_logging + include ::swift::proxy::healthcheck + include ::swift::proxy::cache + include ::swift::proxy::keystone + include ::swift::proxy::authtoken + include ::swift::proxy::staticweb + include ::swift::proxy::ratelimit + include ::swift::proxy::catch_errors + include ::swift::proxy::tempurl + 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'], + } + } + $swift_components = ['account', 'container', 'object'] + swift::storage::filter::recon { $swift_components : } + swift::storage::filter::healthcheck { $swift_components : } + } #END STEP 2 |