Merge "Add support for Dell EMC Unity Cinder backend"

This commit is contained in:
Jenkins 2017-08-19 00:10:52 +00:00 committed by Gerrit Code Review
commit 2d14386548
7 changed files with 113 additions and 0 deletions

View File

@ -312,6 +312,13 @@ topics:
Enables a Cinder Dell EMC Storage Center ISCSI backend
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/cinder-dellemc-unity-config.yaml
title: Cinder Dell EMC Unity backend
description: >
Enables a Cinder Dell EMC Unity backend,
configured via puppet
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/cinder-hpelefthand-config.yaml
title: Cinder HPELeftHandISCSI backend
description: >

View File

@ -0,0 +1,14 @@
# A Heat environment file which can be used to enable a
# Cinder Dell EMC Unity backend, configured via puppet
resource_registry:
OS::TripleO::Services::CinderBackendDellEMCUnity: ../puppet/services/cinder-backend-dellemc-unity.yaml
parameter_defaults:
CinderEnableDellEMCUnityBackend: true
CinderDellEMCUnityBackendName: 'tripleo_dellemc_unity'
CinderDellEMCUnitySanIp: ''
CinderDellEMCUnitySanLogin: 'Admin'
CinderDellEMCUnitySanPassword: ''
CinderDellEMCUnityStorageProtocol: 'iSCSI'
CinderDellEMCUnityIoPorts: ''
CinderDellEMCUnityStoragePoolNames: ''

View File

@ -263,6 +263,7 @@ resource_registry:
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
OS::TripleO::Services::CinderBackendDellPs: OS::Heat::None
OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None
OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None

View File

@ -0,0 +1,85 @@
# Copyright (c) 2016-2017 Dell Inc, or its subsidiaries.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
heat_template_version: pike
description: >
Openstack Cinder Dell EMC Unity backend
parameters:
CinderEnableDellEMCUnityBackend:
type: boolean
default: true
CinderDellEMCUnityBackendName:
type: string
default: 'tripleo_dellemc_unity'
CinderDellEMCUnitySanIp:
type: string
CinderDellEMCUnitySanLogin:
type: string
default: 'Admin'
CinderDellEMCUnitySanPassword:
type: string
hidden: true
CinderDellEMCUnityStorageProtocol:
type: string
default: 'iSCSI'
CinderDellEMCUnityIoPorts:
type: string
default: ''
CinderDellEMCUnityStoragePoolNames:
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 Cinder Dell EMC Storage Center backend.
value:
service_name: cinder_backend_dellemc_unity
config_settings:
tripleo::profile::base::cinder::volume::cinder_enable_dellemc_unity_backend: {get_param: CinderEnableDellEMCUnityBackend}
cinder::backend::dellemc_unity::volume_backend_name: {get_param: CinderDellEMCUnityBackendName}
cinder::backend::dellemc_unity::san_ip: {get_param: CinderDellEMCUnitySanIp}
cinder::backend::dellemc_unity::san_login: {get_param: CinderDellEMCUnitySanLogin}
cinder::backend::dellemc_unity::san_password: {get_param: CinderDellEMCUnitySanPassword}
cinder::backend::dellemc_unity::storage_protocol: {get_param: CinderDellEMCUnityStorageProtocol}
cinder::backend::dellemc_unity::unity_io_ports: {get_param: CinderDellEMCUnityIoPorts}
cinder::backend::dellemc_unity::unity_storage_pool_names: {get_param: CinderDellEMCUnityStoragePoolNames}
step_config: |
include ::tripleo::profile::base::cinder::volume

View File

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

View File

@ -44,6 +44,7 @@
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale

View File

@ -47,6 +47,7 @@
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackendDellPs
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale