Browse Source

Merge "HPELeftHandISCSIDriver support for Cinder"

changes/72/400972/9
Jenkins 6 years ago committed by Gerrit Code Review
parent
commit
7916abc0d0
  1. 7
      capabilities-map.yaml
  2. 13
      environments/cinder-hpelefthand-config.yaml
  3. 1
      overcloud-resource-registry-puppet.j2.yaml
  4. 56
      puppet/services/cinder-hpelefthand-iscsi.yaml
  5. 1
      roles_data.yaml

7
capabilities-map.yaml

@ -404,6 +404,13 @@ topics:
via puppet
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/cinder-hpelefthand-config.yaml
title: Cinder HPELeftHandISCSI backend
description: >
Enables a Cinder HPELeftHandISCSI backend, configured
via puppet
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/cinder-eqlx-config.yaml
title: Cinder EQLX backend
description: >

13
environments/cinder-hpelefthand-config.yaml

@ -0,0 +1,13 @@
# A Heat environment file which can be used to enable a
# a Cinder HPELeftHandISCSI backend, configured via puppet
resource_registry:
OS::TripleO::Services::CinderHPELeftHandISCSI: ../puppet/services/cinder-hpelefthand-iscsi.yaml
parameter_defaults:
CinderHPELeftHandISCSIApiUrl: ''
CinderHPELeftHandISCSIUserName: ''
CinderHPELeftHandISCSIPassword: ''
CinderHPELeftHandISCSIBackendName: 'tripleo_hpelefthand'
CinderHPELeftHandISCSIChapEnabled: false
CinderHPELeftHandClusterName: ''
CinderHPELeftHandDebug: false

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

@ -231,6 +231,7 @@ resource_registry:
OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml
OS::TripleO::Services::Zaqar: OS::Heat::None
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
parameter_defaults:
EnablePackageInstall: false

56
puppet/services/cinder-hpelefthand-iscsi.yaml

@ -0,0 +1,56 @@
heat_template_version: 2017-02-24
description: >
Configure Cinder HPELeftHandISCSIDriver
parameters:
# Config specific parameters, to be provided via parameter_defaults
CinderHPELeftHandISCSIApiUrl:
type: string
CinderHPELeftHandISCSIUserName:
type: string
CinderHPELeftHandISCSIPassword:
type: string
hidden: true
CinderHPELeftHandISCSIBackendName:
type: string
default: 'tripleo_hpelefthand'
CinderHPELeftHandISCSIChapEnabled:
type: boolean
default: false
CinderHPELeftHandClusterName:
type: string
CinderHPELeftHandDebug:
type: boolean
default: false
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
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 Cinder HPELeftHandISCSIDriver
value:
service_name: cinder_hpelefthand_iscsi
config_settings:
tripleo::profile::base::cinder::volume::cinder_enable_hpelefthand_backend: true
cinder::backend::hpelefthand_iscsi::hpelefthand_api_url: {get_param: CinderHPELeftHandISCSIApiUrl}
cinder::backend::hpelefthand_iscsi::hpelefthand_username: {get_param: CinderHPELeftHandISCSIUserName}
cinder::backend::hpelefthand_iscsi::hpelefthand_password: {get_param: CinderHPELeftHandISCSIPassword}
cinder::backend::hpelefthand_iscsi::volume_backend_name: {get_param: CinderHPELeftHandISCSIBackendName}
cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled: {get_param: CinderHPELeftHandISCSIChapEnabled}
cinder::backend::hpelefthand_iscsi::hpelefthand_clustername: {get_param: CinderHPELeftHandClusterName}
cinder::backend::hpelefthand_iscsi::hpelefthand_debug: {get_param: CinderHPELeftHandDebug}
step_config: |
include ::tripleo::profile::base::cinder::volume

1
roles_data.yaml

@ -102,6 +102,7 @@
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::NeutronML2FujitsuCfab
- OS::TripleO::Services::CinderHPELeftHandISCSI
- name: Compute
CountDefault: 1

Loading…
Cancel
Save