diff options
| -rw-r--r-- | capabilities-map.yaml | 7 | ||||
| -rw-r--r-- | deployed-server/deployed-server-roles-data.yaml | 1 | ||||
| -rw-r--r-- | environments/contrail/roles_data_contrail.yaml | 1 | ||||
| -rw-r--r-- | environments/manila-vnx-config.yaml | 18 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/manila-backend-vnx.yaml | 75 | ||||
| -rw-r--r-- | releasenotes/notes/vnx_manila_2967789872aa11e7.yaml | 4 | ||||
| -rw-r--r-- | roles/Controller.yaml | 1 | ||||
| -rw-r--r-- | roles/ControllerOpenstack.yaml | 1 | ||||
| -rw-r--r-- | roles_data.yaml | 1 |
10 files changed, 110 insertions, 0 deletions
diff --git a/capabilities-map.yaml b/capabilities-map.yaml index 7ae218c7..1af6be9e 100644 --- a/capabilities-map.yaml +++ b/capabilities-map.yaml @@ -408,6 +408,13 @@ topics: - file: environments/manila-unity-config.yaml title: Deploys Manila with Unity driver 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: - overcloud-resource-registry-puppet.yaml - title: Glance backends diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index e01d94a1..d4bc1df1 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -85,6 +85,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/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: '' + diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 1f3ec138..0fa0a9fe 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -234,6 +234,7 @@ resource_registry: OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None OS::TripleO::Services::ManilaBackendUnity: 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::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::BarbicanApi: OS::Heat::None diff --git a/puppet/services/manila-backend-vnx.yaml b/puppet/services/manila-backend-vnx.yaml new file mode 100644 index 00000000..13dde4a8 --- /dev/null +++ b/puppet/services/manila-backend-vnx.yaml @@ -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: + + diff --git a/releasenotes/notes/vnx_manila_2967789872aa11e7.yaml b/releasenotes/notes/vnx_manila_2967789872aa11e7.yaml new file mode 100644 index 00000000..963d8b32 --- /dev/null +++ b/releasenotes/notes/vnx_manila_2967789872aa11e7.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add support for Dell EMC VNX Manila driver diff --git a/roles/Controller.yaml b/roles/Controller.yaml index bfe8c39f..8f5e0cc8 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -83,6 +83,7 @@ - OS::TripleO::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendUnity + - OS::TripleO::Services::ManilaBackendVNX - OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 85368c1d..c2130011 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -68,6 +68,7 @@ - OS::TripleO::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendUnity + - OS::TripleO::Services::ManilaBackendVNX - OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached diff --git a/roles_data.yaml b/roles_data.yaml index f13b4558..dcb66af3 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -86,6 +86,7 @@ - OS::TripleO::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendUnity + - OS::TripleO::Services::ManilaBackendVNX - OS::TripleO::Services::ManilaScheduler - OS::TripleO::Services::ManilaShare - OS::TripleO::Services::Memcached |