diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-06 06:34:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-06 06:34:44 +0000 |
| commit | 1b3264c2ad7a5ac3cfdf3f37dd6e899ee7063cfa (patch) | |
| tree | 2a48a5c540daaee5de9e7da8d33c1ca532ed608e /environments | |
| parent | 8431e7412ab8fd7a77befafd0ab687be599ad970 (diff) | |
| parent | 9757cfaeedf05e578e0357769be82d7b125c04ff (diff) | |
Merge "Add support for Dell EMC VMAX Manila Backend" into stable/pike
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/contrail/roles_data_contrail.yaml | 1 | ||||
| -rw-r--r-- | environments/manila-vmax-config.yaml | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml index 38b70e53..4b170751 100644 --- a/environments/contrail/roles_data_contrail.yaml +++ b/environments/contrail/roles_data_contrail.yaml @@ -89,6 +89,7 @@ - OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendCephFs - OS::TripleO::Services::ManilaBackendVNX + - OS::TripleO::Services::ManilaBackendVMAX - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhEvaluator diff --git a/environments/manila-vmax-config.yaml b/environments/manila-vmax-config.yaml new file mode 100644 index 00000000..8c9946ca --- /dev/null +++ b/environments/manila-vmax-config.yaml @@ -0,0 +1,19 @@ +# This environment file enables Manila with the VMAX 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::ManilaBackendVMAX: ../puppet/services/manila-backend-vmax.yaml + +parameter_defaults: + ManilaVMAXBackendName: tripleo_manila_vmax + ManilaVMAXDriverHandlesShareServers: true + ManilaVMAXNasLogin: '' + ManilaVMAXNasPassword: '' + ManilaVMAXNasServer: '' + ManilaVMAXServerContainer: '' + ManilaVMAXShareDataPools: '' + ManilaVMAXEthernetPorts: '' + + |