Browse Source

Merge "Add support for Dell EMC VNX Cinder Backend"

changes/34/540634/4
Zuul 5 years ago committed by Gerrit Code Review
parent
commit
16e15b73b9
  1. 7
      capabilities-map.yaml
  2. 1
      deployed-server/deployed-server-roles-data.yaml
  3. 19
      environments/cinder-dellemc-vnx-config.yaml
  4. 1
      overcloud-resource-registry-puppet.j2.yaml
  5. 106
      puppet/services/cinder-backend-dellemc-vnx.yaml
  6. 4
      releasenotes/notes/vnx_cinder_b5572898724a11e7.yaml
  7. 1
      roles/Controller.yaml
  8. 1
      roles/ControllerNoCeph.yaml
  9. 1
      roles/ControllerNovaStandalone.yaml
  10. 1
      roles_data.yaml

7
capabilities-map.yaml

@ -342,6 +342,13 @@ topics:
configured via puppet
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/cinder-dellemc-vnx-config.yaml
title: Cinder Dell EMC VNX backend
description: >
Enables a Cinder Dell EMC VNX backend,
configured via puppet
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/cinder-hpelefthand-config.yaml
title: Cinder HPELeftHandISCSI backend
description: >

1
deployed-server/deployed-server-roles-data.yaml

@ -56,6 +56,7 @@
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale

19
environments/cinder-dellemc-vnx-config.yaml

@ -0,0 +1,19 @@
# A Heat environment file which can be used to enable a
# Cinder Dell EMC VNX backend, configured via puppet
resource_registry:
OS::TripleO::Services::CinderBackendDellEMCVNX: ../puppet/services/cinder-backend-dellemc-vnx.yaml
parameter_defaults:
CinderEnableDellEMCVNXBackend: true
CinderDellEMCVNXBackendName: 'tripleo_dellemc_vnx'
CinderDellEMCVNXSanIp: ''
CinderDellEMCVNXSanLogin: 'admin'
CinderDellEMCVNXSanPassword: ''
CinderDellEMCVNXStorageProtocol: 'iscsi'
CinderDellEMCVNXStoragePoolName: ''
CinderDellEMCVNXDefaultTimeout: 3600
CinderDellEMCVNXMaxLunsPerStorageGroup: 255
CinderDellEMCVNXInitiatorAutoRegistration: 'true'
CinderDellEMCVNXAuthType: 'global'
CinderDellEMCVNXStorageSecurityFileDir: '/etc/secfile/array1'
CinderDellEMCVNXNaviSecCliPath: '/opt/Navisphere/bin/naviseccli'

1
overcloud-resource-registry-puppet.j2.yaml

@ -296,6 +296,7 @@ resource_registry:
OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: OS::Heat::None
OS::TripleO::Services::CinderBackendDellEMCVNX: OS::Heat::None
OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None

106
puppet/services/cinder-backend-dellemc-vnx.yaml

@ -0,0 +1,106 @@
# Copyright (c) 2016-2018 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: queens
description: >
Openstack Cinder Dell EMC VNX backend
parameters:
CinderEnableDellEMCVNXBackend:
type: boolean
default: true
CinderDellEMCVNXBackendName:
type: string
default: tripleo_dellemc_vnx
CinderDellEMCVNXSanIp:
type: string
CinderDellEMCVNXSanLogin:
type: string
default: admin
CinderDellEMCVNXSanPassword:
type: string
hidden: true
default: ''
CinderDellEMCVNXStorageProtocol:
type: string
default: iscsi
CinderDellEMCVNXStoragePoolName:
type: string
default: ''
CinderDellEMCVNXDefaultTimeout:
type: number
default: 3600
CinderDellEMCVNXMaxLunsPerStorageGroup:
type: number
default: 255
CinderDellEMCVNXInitiatorAutoRegistration:
type: string
default: true
CinderDellEMCVNXAuthType:
type: string
default: global
CinderDellEMCVNXStorageSecurityFileDir:
type: string
default: /etc/secfile/array1
CinderDellEMCVNXNaviSecCliPath:
type: string
default: /opt/Navisphere/bin/naviseccli
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 VNX backend.
value:
service_name: cinder_backend_dellemc_vnx
config_settings:
tripleo::profile::base::cinder::volume::cinder_enable_dellemc_vnx_backend: {get_param: CinderEnableDellEMCVNXBackend}
cinder::backend::emc_vnx::volume_backend_name: {get_param: CinderDellEMCVNXBackendName}
cinder::backend::emc_vnx::san_ip: {get_param: CinderDellEMCVNXSanIp}
cinder::backend::emc_vnx::san_login: {get_param: CinderDellEMCVNXSanLogin}
cinder::backend::emc_vnx::san_password: {get_param: CinderDellEMCVNXSanPassword}
cinder::backend::emc_vnx::storage_protocol: {get_param: CinderDellEMCVNXStorageProtocol}
cinder::backend::emc_vnx::storage_vnx_pool_name: {get_param: CinderDellEMCVNXStoragePoolName}
cinder::backend::emc_vnx::default_timeout: {get_param: CinderDellEMCVNXDefaultTimeout}
cinder::backend::emc_vnx::max_luns_per_storage_group: {get_param: CinderDellEMCVNXMaxLunsPerStorageGroup}
cinder::backend::emc_vnx::initiator_auto_registration: {get_param: CinderDellEMCVNXInitiatorAutoRegistration}
cinder::backend::emc_vnx::storage_vnx_auth_type: {get_param: CinderDellEMCVNXAuthType}
cinder::backend::emc_vnx::storage_vnx_security_file_dir: {get_param: CinderDellEMCVNXStorageSecurityFileDir}
cinder::backend::emc_vnx::naviseccli_path: {get_param: CinderDellEMCVNXNaviSecCliPath}
step_config: |
include ::tripleo::profile::base::cinder::volume

4
releasenotes/notes/vnx_cinder_b5572898724a11e7.yaml

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

1
roles/Controller.yaml

@ -52,6 +52,7 @@
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale

1
roles/ControllerNoCeph.yaml

@ -48,6 +48,7 @@
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale

1
roles/ControllerNovaStandalone.yaml

@ -41,6 +41,7 @@
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale

1
roles_data.yaml

@ -55,6 +55,7 @@
- OS::TripleO::Services::CinderBackendDellSc
- OS::TripleO::Services::CinderBackendDellEMCUnity
- OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
- OS::TripleO::Services::CinderBackendDellEMCVNX
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale

Loading…
Cancel
Save