aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 06:53:55 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 06:53:56 +0000
commit1b7b7e55f94fa0bde7a8834597bfe24b2f20456a (patch)
treeea6c412ddea74d3a484c173aa0c4a7c7164008fe /environments
parent1b3264c2ad7a5ac3cfdf3f37dd6e899ee7063cfa (diff)
parentbc726c11370ede09afce917bec9b712831a0a286 (diff)
Merge "Add support for Dell EMC Isilon Manila backend" into stable/pike
Diffstat (limited to 'environments')
-rw-r--r--environments/contrail/roles_data_contrail.yaml1
-rw-r--r--environments/manila-isilon-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 4b170751..bd697160 100644
--- a/environments/contrail/roles_data_contrail.yaml
+++ b/environments/contrail/roles_data_contrail.yaml
@@ -87,6 +87,7 @@
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity
+ - OS::TripleO::Services::ManilaBackendIsilon
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaBackendVMAX
diff --git a/environments/manila-isilon-config.yaml b/environments/manila-isilon-config.yaml
new file mode 100644
index 00000000..809900c8
--- /dev/null
+++ b/environments/manila-isilon-config.yaml
@@ -0,0 +1,17 @@
+# This environment file enables Manila with the Isilon 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::ManilaBackendIsilon: ../puppet/services/manila-backend-isilon.yaml
+
+parameter_defaults:
+ ManilaIsilonBackendName: tripleo_isilon
+ ManilaIsilonDriverHandlesShareServers: true
+ ManilaIsilonNasLogin: ''
+ ManilaIsilonNasPassword: ''
+ ManilaIsilonNasServer: ''
+ ManilaIsilonNasRootDir: ''
+ ManilaIsilonNasServerPort: 8080
+ ManilaIsilonNasServerSecure: ''