summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-31 01:52:28 +0000
committerGerrit Code Review <review@openstack.org>2017-08-31 01:52:28 +0000
commit7585e655a6f4662ba48c2c9850f7938346d8137f (patch)
tree23ced8cc4385938d8b80b17207afbf55acfe169c /environments
parente8114a2f4ae305872316fc589ff04cf6aac6486a (diff)
parent992478e3dafaf2dc129508a4fddc8a3157ad2243 (diff)
Merge "Add support for Dell EMC Unity Manila Backend" into stable/pike
Diffstat (limited to 'environments')
-rw-r--r--environments/contrail/roles_data_contrail.yaml1
-rw-r--r--environments/manila-unity-config.yaml17
2 files changed, 18 insertions, 0 deletions
diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml
index dd1c5455..b247ff96 100644
--- a/environments/contrail/roles_data_contrail.yaml
+++ b/environments/contrail/roles_data_contrail.yaml
@@ -86,6 +86,7 @@
- OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendNetapp
+ - OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::AodhApi
diff --git a/environments/manila-unity-config.yaml b/environments/manila-unity-config.yaml
new file mode 100644
index 00000000..418404e1
--- /dev/null
+++ b/environments/manila-unity-config.yaml
@@ -0,0 +1,17 @@
+# This environment file enables Manila with the Unity 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::ManilaBackendUnity: ../puppet/services/manila-backend-unity.yaml
+
+parameter_defaults:
+ ManilaUnityBackendName: tripleo_manila_unity
+ ManilaUnityDriverHandlesShareServers: true
+ ManilaUnityNasLogin: ''
+ ManilaUnityNasPassword: ''
+ ManilaUnityNasServer: ''
+ ManilaUnityServerMetaPool: ''
+ ManilaUnityShareDataPools: ''
+ ManilaUnityEthernetPorts: ''