Merge "Enable Equallogic Backends in Cinder"

4 files changed, 131 insertions, 2 deletions

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 0d5443b9..a825f582 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1142,6 +1142,7 @@ resources:
             - '"%{::osfamily}"'
             - common
             - cinder_netapp_data # Optionally provided by ControllerExtraConfigPre
+            - cinder_eqlx_data # Optionally provided by ControllerExtraConfigPre
             - neutron_bigswitch_data # Optionally provided by ControllerExtraConfigPre
             - neutron_cisco_data # Optionally provided by ControllerExtraConfigPre
             - cisco_n1kv_data # Optionally provided by ControllerExtraConfigPre
diff --git a/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml b/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml
new file mode 100644
index 00000000..c73608f1
--- /dev/null
+++ b/puppet/extraconfig/pre_deploy/controller/cinder-eqlx.yaml
@@ -0,0 +1,86 @@
+heat_template_version: 2015-11-06
+
+description: Configure hieradata for Cinder Eqlx configuration
+
+parameters:
+  server:
+    description: ID of the controller node to apply this config to
+    type: string
+
+  # Config specific parameters, to be provided via parameter_defaults
+  CinderEnableEqlxBackend:
+    type: boolean
+    default: true
+  CinderEqlxBackendName:
+    type: string
+    default: 'tripleo_eqlx'
+  CinderEqlxSanIp:
+    type: string
+  CinderEqlxSanLogin:
+    type: string
+  CinderEqlxSanPassword:
+    type: string
+    hidden: true
+  CinderEqlxSanThinProvision:
+    type: boolean
+    default: true
+  CinderEqlxGroupname:
+    type: string
+    default: 'group-0'
+  CinderEqlxPool:
+    type: string
+    default: 'default'
+  CinderEqlxChapLogin:
+    type: string
+    default: ''
+  CinderEqlxChapPassword:
+    type: string
+    default: ''
+  CinderEqlxUseChap:
+    type: boolean
+    default: false
+
+resources:
+  CinderEqlxConfig:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
+      config:
+        hiera:
+          datafiles:
+            cinder_eqlx_data:
+              mapped_data:
+                cinder_enable_eqlx_backend: {get_input: EnableEqlxBackend}
+                cinder::backend::eqlx::volume_backend_name: {get_input: EqlxBackendName}
+                cinder::backend::eqlx::san_ip: {get_input: EqlxSanIp}
+                cinder::backend::eqlx::san_login: {get_input: EqlxSanLogin}
+                cinder::backend::eqlx::san_password: {get_input: EqlxSanPassword}
+                cinder::backend::eqlx::san_thin_provision: {get_input: EqlxSanThinProvision}
+                cinder::backend::eqlx::eqlx_group_name: {get_input: EqlxGroupname}
+                cinder::backend::eqlx::eqlx_pool: {get_input: EqlxPool}
+                cinder::backend::eqlx::eqlx_use_chap: {get_input: EqlxUseChap}
+                cinder::backend::eqlx::eqlx_chap_login: {get_input: EqlxChapLogin}
+                cinder::backend::eqlx::eqlx_chap_password: {get_input: EqlxChapPassword}
+
+  CinderEqlxDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: CinderEqlxConfig}
+      server: {get_param: server}
+      input_values:
+        EnableEqlxBackend: {get_param: CinderEnableEqlxBackend}
+        EqlxBackendName: {get_param: CinderEqlxBackendName}
+        EqlxSanIp: {get_param: CinderEqlxSanIp}
+        EqlxSanLogin: {get_param: CinderEqlxSanLogin}
+        EqlxSanPassword: {get_param: CinderEqlxSanPassword}
+        EqlxSanThinProvision: {get_param: CinderEqlxSanThinProvision}
+        EqlxGroupname: {get_param: CinderEqlxGroupname}
+        EqlxPool: {get_param: CinderEqlxPool}
+        EqlxUseChap: {get_param: CinderEqlxUseChap}
+        EqlxChapLogin: {get_param: CinderEqlxChapLogin}
+        EqlxChapPassword: {get_param: CinderEqlxChapPassword}
+
+outputs:
+  deploy_stdout:
+    description: Deployment reference, used to trigger puppet apply on changes
+    value: {get_attr: [CinderEqlxDeployment, deploy_stdout]}
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 508025cf..913bcb63 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -399,6 +399,27 @@ if hiera('step') >= 3 {
     }
   }
 
+  if hiera('cinder_enable_eqlx_backend', false) {
+    $cinder_eqlx_backend = hiera('cinder::backend::eqlx::volume_backend_name')
+
+    cinder_config {
+      "${cinder_eqlx_backend}/host": value => 'hostgroup';
+    }
+
+    cinder::backend::eqlx { $cinder_eqlx_backend :
+      volume_backend_name => hiera('cinder::backend::eqlx::volume_backend_name', undef),
+      san_ip              => hiera('cinder::backend::eqlx::san_ip', undef),
+      san_login           => hiera('cinder::backend::eqlx::san_login', undef),
+      san_password        => hiera('cinder::backend::eqlx::san_password', undef),
+      san_thin_provision  => hiera('cinder::backend::eqlx::san_thin_provision', undef),
+      eqlx_group_name     => hiera('cinder::backend::eqlx::eqlx_group_name', undef),
+      eqlx_pool           => hiera('cinder::backend::eqlx::eqlx_lpool', undef),
+      eqlx_use_chap       => hiera('cinder::backend::eqlx::eqlx_use_chap', undef),
+      eqlx_chap_login     => hiera('cinder::backend::eqlx::eqlx_chap_login', undef),
+      eqlx_chap_password  => hiera('cinder::backend::eqlx::eqlx_san_password', undef),
+    }
+  }
+
   if hiera('cinder_enable_netapp_backend', false) {
     $cinder_netapp_backend = hiera('cinder::backend::netapp::title')
 
@@ -452,7 +473,7 @@ if hiera('step') >= 3 {
     }
   }
 
-  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend, $cinder_nfs_backend])
+  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_eqlx_backend, $cinder_netapp_backend, $cinder_nfs_backend])
   class { '::cinder::backends' :
     enabled_backends => $cinder_enabled_backends,
   }
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index dc8d6338..e6ee85ae 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -773,6 +773,27 @@ if hiera('step') >= 3 {
     }
   }
 
+  if hiera('cinder_enable_eqlx_backend', false) {
+    $cinder_eqlx_backend = hiera('cinder::backend::eqlx::volume_backend_name')
+
+    cinder_config {
+      "${cinder_eqlx_backend}/host": value => 'hostgroup';
+    }
+
+    cinder::backend::eqlx { $cinder_eqlx_backend :
+      volume_backend_name => hiera('cinder::backend::eqlx::volume_backend_name', undef),
+      san_ip              => hiera('cinder::backend::eqlx::san_ip', undef),
+      san_login           => hiera('cinder::backend::eqlx::san_login', undef),
+      san_password        => hiera('cinder::backend::eqlx::san_password', undef),
+      san_thin_provision  => hiera('cinder::backend::eqlx::san_thin_provision', undef),
+      eqlx_group_name     => hiera('cinder::backend::eqlx::eqlx_group_name', undef),
+      eqlx_pool           => hiera('cinder::backend::eqlx::eqlx_lpool', undef),
+      eqlx_use_chap       => hiera('cinder::backend::eqlx::eqlx_use_chap', undef),
+      eqlx_chap_login     => hiera('cinder::backend::eqlx::eqlx_chap_login', undef),
+      eqlx_chap_password  => hiera('cinder::backend::eqlx::eqlx_san_password', undef),
+    }
+  }
+
   if hiera('cinder_enable_netapp_backend', false) {
     $cinder_netapp_backend = hiera('cinder::backend::netapp::title')
 
@@ -826,7 +847,7 @@ if hiera('step') >= 3 {
     }
   }
 
-  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend, $cinder_nfs_backend])
+  $cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_netapp_backend, $cinder_nfs_backend,$cinder_eqlx_backend])
   class { '::cinder::backends' :
     enabled_backends => $cinder_enabled_backends,
   }