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

diff --git a/controller.yaml b/controller.yaml
index c46fe2e..ef3f8be 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -76,6 +76,10 @@ parameters:
     default: false
     description: Whether to deploy Ceph Storage (OSD) on the Controller
     type: boolean
+  EnableSwiftStorage:
+    default: true
+    description: Whether to enable Swift Storage on the Controller
+    type: boolean
   ExtraConfig:
     default: {}
     description: |

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 68de0af..f661d04 100644 (file)
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -272,6 +272,10 @@ parameters:
     default: false
     description: Whether to deploy Ceph Storage (OSD) on the Controller
     type: boolean
+  ControllerEnableSwiftStorage:
+    default: true
+    description: Whether to enable Swift Storage on the Controller
+    type: boolean
   ExtraConfig:
     default: {}
     description: |
@@ -553,6 +557,7 @@ resources:
           EnableGalera: {get_param: EnableGalera}
           EnablePacemaker: {get_param: EnablePacemaker}
           EnableCephStorage: {get_param: ControllerEnableCephStorage}
+          EnableSwiftStorage: {get_param: ControllerEnableSwiftStorage}
           ExtraConfig: {get_param: ExtraConfig}
           Flavor: {get_param: OvercloudControlFlavor}
           GlancePort: {get_param: GlancePort}

diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index e9b33e7..b8aabe6 100644 (file)
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -76,6 +76,10 @@ parameters:
     default: false
     description: Whether to deploy Ceph Storage (OSD) on the Controller
     type: boolean
+  EnableSwiftStorage:
+    default: true
+    description: Whether to enable Swift Storage on the Controller
+    type: boolean
   ExtraConfig:
     default: {}
     description: |
@@ -526,6 +530,7 @@ resources:
         enable_galera: {get_param: EnableGalera}
         enable_pacemaker: {get_param: EnablePacemaker}
         enable_ceph_storage: {get_param: EnableCephStorage}
+        enable_swift_storage: {get_param: EnableSwiftStorage}
         mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
         mysql_root_password: {get_param: MysqlRootPassword}
         mysql_cluster_name:
@@ -738,6 +743,7 @@ resources:
                 admin_password: {get_input: admin_password}
                 enable_galera: {get_input: enable_galera}
                 enable_ceph_storage: {get_input: enable_ceph_storage}
+                enable_swift_storage: {get_input: enable_swift_storage}
                 mysql_innodb_buffer_pool_size: {get_input: mysql_innodb_buffer_pool_size}
                 mysql::server::root_password: {get_input: mysql_root_password}
                 mysql_cluster_name: {get_input: mysql_cluster_name}

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index caf9fcf..b1ccf3d 100644 (file)
--- 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