diff options
| -rw-r--r-- | controller.yaml | 4 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 5 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 5 |
4 files changed, 20 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index 4037fb08..c46fe2ea 100644 --- a/controller.yaml +++ b/controller.yaml @@ -72,6 +72,10 @@ parameters: description: If enabled services will be monitored by Pacemaker; it will manage VIPs as well, in place of Keepalived. type: boolean + EnableCephStorage: + default: false + description: Whether to deploy Ceph Storage (OSD) on the Controller + type: boolean ExtraConfig: default: {} description: | diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 32dc9709..68de0afd 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -268,6 +268,10 @@ parameters: description: If enabled services will be monitored by Pacemaker; it will manage VIPs as well, in place of Keepalived. type: boolean + ControllerEnableCephStorage: + default: false + description: Whether to deploy Ceph Storage (OSD) on the Controller + type: boolean ExtraConfig: default: {} description: | @@ -548,6 +552,7 @@ resources: Debug: {get_param: Debug} EnableGalera: {get_param: EnableGalera} EnablePacemaker: {get_param: EnablePacemaker} + EnableCephStorage: {get_param: ControllerEnableCephStorage} 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 a23a1db3..e9b33e74 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -72,6 +72,10 @@ parameters: description: If enabled services will be monitored by Pacemaker; it will manage VIPs as well, in place of Keepalived. type: boolean + EnableCephStorage: + default: false + description: Whether to deploy Ceph Storage (OSD) on the Controller + type: boolean ExtraConfig: default: {} description: | @@ -521,6 +525,7 @@ resources: - ':5000/v2.0/' enable_galera: {get_param: EnableGalera} enable_pacemaker: {get_param: EnablePacemaker} + enable_ceph_storage: {get_param: EnableCephStorage} mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} mysql_root_password: {get_param: MysqlRootPassword} mysql_cluster_name: @@ -732,6 +737,7 @@ resources: # MySQL admin_password: {get_input: admin_password} enable_galera: {get_input: enable_galera} + enable_ceph_storage: {get_input: enable_ceph_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 8a8c0eb8..caf9fcf5 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -206,6 +206,11 @@ if hiera('step') >= 2 { include ::ceph::profile::mon } + if str2bool(hiera('enable_ceph_storage', 'false')) { + include ::ceph::profile::client + include ::ceph::profile::osd + } + } #END STEP 2 if hiera('step') >= 3 { |