diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-31 01:52:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-31 01:52:35 +0000 |
| commit | 831fb49f7de6e89b7b7f7640ebef594c0350af82 (patch) | |
| tree | 6a4729ef734989a82ddbd060cd5b717f9887a0e3 /environments | |
| parent | 7585e655a6f4662ba48c2c9850f7938346d8137f (diff) | |
| parent | 5f40937c44734b4bd7875507c13a18fac3229fdf (diff) | |
Merge "Add support for Dell EMC VNX Manila Backend" into stable/pike
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/contrail/roles_data_contrail.yaml | 1 | ||||
| -rw-r--r-- | environments/manila-vnx-config.yaml | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml index b247ff96..38b70e53 100644 --- a/environments/contrail/roles_data_contrail.yaml +++ b/environments/contrail/roles_data_contrail.yaml @@ -88,6 +88,7 @@ - OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendCephFs + - OS::TripleO::Services::ManilaBackendVNX - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhEvaluator diff --git a/environments/manila-vnx-config.yaml b/environments/manila-vnx-config.yaml new file mode 100644 index 00000000..9a0ea59b --- /dev/null +++ b/environments/manila-vnx-config.yaml @@ -0,0 +1,18 @@ +# This environment file enables Manila with the VNX backend. +resource_registry: + OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml + OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml + # Only manila-share is pacemaker managed: + OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaBackendVNX: ../puppet/services/manila-backend-vnx.yaml + +parameter_defaults: + ManilaVNXBackendName: tripleo_manila_vnx + ManilaVNXDriverHandlesShareServers: true + ManilaVNXNasLogin: '' + ManilaVNXNasPassword: '' + ManilaVNXNasServer: '' + ManilaVNXServerMetaPool: '' + ManilaVNXShareDataPools: '' + ManilaVNXEthernetPorts: '' + |