Merge "Add support for Dell EMC VNX Manila Backend"

This commit is contained in:
Jenkins 2017-08-28 19:58:10 +00:00 committed by Gerrit Code Review
commit 6f4cb34571
10 changed files with 110 additions and 0 deletions

View File

@ -408,6 +408,13 @@ topics:
- file: environments/manila-unity-config.yaml - file: environments/manila-unity-config.yaml
title: Deploys Manila with Unity driver title: Deploys Manila with Unity driver
description: Deploys Manila and configures Unity as its default backend. description: Deploys Manila and configures Unity as its default backend.
- title: Manila with VNX
description: >
Deploys Manila and configures it with the VNX driver.
environments:
- file: environments/manila-vnx-config.yaml
title: Deploys Manila with VNX driver
description: Deploys Manila and configures VNX as its default backend.
requires: requires:
- overcloud-resource-registry-puppet.yaml - overcloud-resource-registry-puppet.yaml
- title: Glance backends - title: Glance backends

View File

@ -85,6 +85,7 @@
- OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendCephFs - OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaShare - OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhApi
- OS::TripleO::Services::AodhEvaluator - OS::TripleO::Services::AodhEvaluator

View File

@ -88,6 +88,7 @@
- OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendCephFs - OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaShare - OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhApi
- OS::TripleO::Services::AodhEvaluator - OS::TripleO::Services::AodhEvaluator

View File

@ -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: ''

View File

@ -234,6 +234,7 @@ resource_registry:
OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None
OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::BarbicanApi: OS::Heat::None OS::TripleO::Services::BarbicanApi: OS::Heat::None

View File

@ -0,0 +1,75 @@
heat_template_version: pike
description: >
Openstack Manila vnx backend.
parameters:
ManilaVNXDriverHandlesShareServers:
type: string
default: false
ManilaVNXBackendName:
type: string
default: tripleo_manila_vnx
ManilaVNXNasLogin:
type: string
default: ''
ManilaVNXNasPassword:
type: string
default: ''
ManilaVNXNasServer:
type: string
default: ''
ManilaVNXServerContainer:
type: string
default: ''
ManilaVNXShareDataPools:
type: string
default: ''
ManilaVNXEthernetPorts:
type: string
default: ''
ServiceData:
default: {}
description: Dictionary packing service data
type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
EndpointMap:
default: {}
type: json
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
outputs:
role_data:
description: Role data for the Manila VNX backend.
value:
service_name: manila_backend_vnx
config_settings:
manila::backend::dellemc_vnx::title: {get_param: ManilaVNXBackendName}
manila::backend::dellemc_vnx::emc_nas_login: {get_param: ManilaVNXNasLogin}
manila::backend::dellemc_vnx::driver_handles_share_servers: {get_param: ManilaVNXDriverHandlesShareServers}
manila::backend::dellemc_vnx::emc_nas_password: {get_param: ManilaVNXNasPassword}
manila::backend::dellemc_vnx::emc_nas_server: {get_param: ManilaVNXNasServer}
manila::backend::dellemc_vnx::emc_share_backend: {'vnx'}
manila::backend::dellemc_vnx::vnx_server_container: {get_param: ManilaVNXServerContainer}
manila::backend::dellemc_vnx::vnx_share_data_pools: {get_param: ManilaVNXShareDataPools}
manila::backend::dellemc_vnx::vnx_ethernet_ports: {get_param: ManilaVNXEthernetPorts}
step_config:

View File

@ -0,0 +1,4 @@
---
features:
- |
Add support for Dell EMC VNX Manila driver

View File

@ -83,6 +83,7 @@
- OS::TripleO::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaShare - OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::Memcached - OS::TripleO::Services::Memcached

View File

@ -68,6 +68,7 @@
- OS::TripleO::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaShare - OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::Memcached - OS::TripleO::Services::Memcached

View File

@ -86,6 +86,7 @@
- OS::TripleO::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity - OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendVNX
- OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaShare - OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::Memcached - OS::TripleO::Services::Memcached