Browse Source

Merge "cinder: remove support for the Veritas HyperScale driver"

changes/56/785956/4
Zuul 6 months ago
committed by Gerrit Code Review
parent
commit
63bfc93e9b
  1. 1
      ci/environments/scenario000-standalone.yaml
  2. 61
      deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml
  3. 127
      deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml
  4. 1
      environments/undercloud/undercloud-minion.yaml
  5. 18
      environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml
  6. 32
      environments/veritas-hyperscale/veritas-hyperscale-config.yaml
  7. 2
      overcloud-resource-registry-puppet.j2.yaml
  8. 12
      releasenotes/notes/remove-veritas-hyperscale-a0b5da7d882c853f.yaml
  9. 1
      roles/BlockStorage.yaml
  10. 1
      roles/Controller.yaml
  11. 1
      roles/ControllerNoCeph.yaml
  12. 1
      roles/ControllerNovaStandalone.yaml
  13. 1
      roles/ControllerSriov.yaml
  14. 1
      roles/ControllerStorageDashboard.yaml
  15. 1
      roles/ControllerStorageNfs.yaml
  16. 1
      roles/Standalone.yaml
  17. 2
      roles_data.yaml
  18. 1
      sample-env-generator/undercloud-minion.yaml

1
ci/environments/scenario000-standalone.yaml

@ -179,7 +179,6 @@ resource_registry:
OS::TripleO::Services::Unbound: OS::Heat::None
OS::TripleO::Services::UndercloudTLS: OS::Heat::None
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
OS::TripleO::Services::Vpp: OS::Heat::None
OS::TripleO::Services::Xinetd: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None

61
deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml

@ -1,61 +0,0 @@
# Copyright (c) 2017 Veritas Technologies LLC.
#
# 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: wallaby
description: >
Openstack Veritas HyperScale backend
parameters:
CinderVeritasHyperScaleAvailabilityZone:
default: ''
description: >
The availability zone of the Veritas HyperScale Cinder backend.
When set, it overrides the default CinderStorageAvailabilityZone.
type: string
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
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 Veritas HyperScale backend.
value:
service_name: cinder_backend_veritas_hyperscale
config_settings:
map_merge:
- tripleo::profile::base::cinder::volume::cinder_enable_vrts_hs_backend: true
- if:
- not: {equals : [{get_param: CinderVeritasHyperScaleAvailabilityZone}, '']}
- cinder::backend::veritas_hyperscale::backend_availability_zone: {get_param: CinderVeritasHyperScaleAvailabilityZone}

127
deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml

@ -1,127 +0,0 @@
# Copyright (c) 2017 Veritas Technologies LLC.
#
# 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: wallaby
description: >
Openstack Veritas HyperScale backend
parameters:
VrtsRabbitPassword:
type: string
description: The Rabbitmq password of the hyperscale user. Mandatory.
VrtsKeystonePassword:
type: string
description: The Keystone password of the hyperscale service. Mandatory.
VrtsMysqlPassword:
type: string
description: The MySQL password of the hyperscale user. Mandatory.
VrtsCtrlMgmtIP:
type: string
default: ''
description: The management IP of HyperScale. The value will be inferred
from the rest of the deployment settings if left blank.
VrtsDashboardIP:
type: string
default: ''
description: The dashboard IP of HyperScale. The value will be inferred
from the rest of the deployment settings if left blank.
VrtsZookeeperIP:
type: string
description: The IP of a node where Zookeeper is configured. Mandatory.
VrtsSSHPassword:
type: string
description: The SSH password of the hyperscale user. Mandatory.
VrtsConfigParam1:
type: string
default: ''
description: Additional config parameter. Optional.
VrtsConfigParam2:
type: string
default: ''
description: Additional config parameter. Optional.
VrtsConfigParam3:
type: string
default: ''
description: Additional config parameter. Optional.
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
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.
KeystoneRegion:
type: string
default: 'regionOne'
description: Keystone region for endpoint
outputs:
role_data:
description: Install Veritas HyperScale packages for controller.
value:
service_name: veritas_hyperscale_controller
config_settings:
global_config_settings:
vrts_ctrl_mgmt_ip: {get_param: VrtsCtrlMgmtIP}
vrts_dashboard_ip: {get_param: VrtsDashboardIP}
vrts_zookeeper_ip: {get_param: VrtsZookeeperIP}
vrts_ssh_passwd: {get_param: VrtsSSHPassword}
vrts_config_param1: {get_param: VrtsConfigParam1}
vrts_config_param2: {get_param: VrtsConfigParam2}
vrts_config_param3: {get_param: VrtsConfigParam3}
step_config: |
include ::veritas_hyperscale::controller_pkg_inst
service_config_settings:
rabbitmq:
vrts_rabbitmq_passwd: {get_param: VrtsRabbitPassword}
mysql:
vrts_mysql_passwd: {get_param: VrtsMysqlPassword}
keystone_resources:
hyperscale:
# Replicating what was done with Puppet manifest:
# https://github.com/vtas-hyperscale-ci/puppet-veritas_hyperscale/blob/7c7868adb027c5bcfdcb6fc9d86610470759ae28/manifests/hs_keystone.pp#L17
# Moving forward, we should have the Veritas part of EndpointMap so the service
# can live outside of the Keystone node.
endpoints:
public: &veritas_endpoint
make_url:
scheme: {get_param: [EndpointMap, KeystoneAdmin, protocol]}
host: {get_param: [EndpointMap, KeystoneAdmin, host]}
port: 8753
path: /v1/%(tenant_id)s
internal: *veritas_endpoint
admin: *veritas_endpoint
users:
hyperscale:
password: {get_param: VrtsKeystonePassword}
region: {get_param: KeystoneRegion}
service: 'infrastructure'
roles:
- infra_admin

1
environments/undercloud/undercloud-minion.yaml

@ -288,7 +288,6 @@ resource_registry:
OS::TripleO::Services::UndercloudMinionMessaging: ../../deployment/undercloud/minion-rabbitmq-puppet.yaml
OS::TripleO::Services::UndercloudTLS: OS::Heat::None
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
OS::TripleO::Services::Vpp: OS::Heat::None
OS::TripleO::Services::Xinetd: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None

18
environments/veritas-hyperscale/cinder-veritas-hyperscale-config.yaml

@ -1,18 +0,0 @@
# Copyright (c) 2017 Veritas Technologies LLC.
#
# 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.
#
# A Heat environment file which can be used to enable a
# a Veritas HyperScale backend, configured via puppet
resource_registry:
OS::TripleO::Services::CinderBackendVRTSHyperScale: ../../deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml

32
environments/veritas-hyperscale/veritas-hyperscale-config.yaml

@ -1,32 +0,0 @@
# Copyright (c) 2017 Veritas Technologies LLC.
#
# 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.
#
# A Heat environment file which can be used to install
# Veritas HyperScale packages for controller.
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::VRTSHyperScale: ../../deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml
parameter_defaults:
EnablePackageInstall: true
VrtsRabbitPassword: ''
VrtsKeystonePassword: ''
VrtsMysqlPassword: ''
VrtsCtrlMgmtIP: ''
VrtsDashboardIP: ''
VrtsZookeeperIP: ''
VrtsSSHPassword: ''
VrtsConfigParam1: ''
VrtsConfigParam2: ''
VrtsConfigParam3: ''

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

@ -282,7 +282,6 @@ resource_registry:
OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
OS::TripleO::Services::CinderBackendPure: OS::Heat::None
OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None
OS::TripleO::Services::CinderBackendNVMeOF: OS::Heat::None
OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
OS::TripleO::Services::CinderVolumeEdge: OS::Heat::None
@ -308,7 +307,6 @@ resource_registry:
OS::TripleO::Services::Clustercheck: deployment/pacemaker/clustercheck-container-puppet.yaml
OS::TripleO::Services::Rsyslog: OS::Heat::None
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
OS::TripleO::Services::LoginDefs: OS::Heat::None
OS::TripleO::Services::ComputeInstanceHA: OS::Heat::None
OS::TripleO::Services::DesignateApi: OS::Heat::None

12
releasenotes/notes/remove-veritas-hyperscale-a0b5da7d882c853f.yaml

@ -0,0 +1,12 @@
---
upgrade:
- |
The following two services have been removed, and should be removed from
role data during upgrade.
- ``OS::TripleO::Services::CinderBackendVRTSHyperScale``
- ``OS::TripleO::Services::VRTSHyperScale``
deprecations:
- |
Supoort for the Veritas HyperScale Driver has been removed.

1
roles/BlockStorage.yaml

@ -22,7 +22,6 @@
- OS::TripleO::Services::BlockStorageCinderVolume
- OS::TripleO::Services::BootParams
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Frr
- OS::TripleO::Services::IpaClient

1
roles/Controller.yaml

@ -73,7 +73,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI

1
roles/ControllerNoCeph.yaml

@ -61,7 +61,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI

1
roles/ControllerNovaStandalone.yaml

@ -55,7 +55,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler

1
roles/ControllerSriov.yaml

@ -65,7 +65,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI

1
roles/ControllerStorageDashboard.yaml

@ -71,7 +71,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI

1
roles/ControllerStorageNfs.yaml

@ -72,7 +72,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI

1
roles/Standalone.yaml

@ -69,7 +69,6 @@
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler

2
roles_data.yaml

@ -76,7 +76,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
@ -292,7 +291,6 @@
- OS::TripleO::Services::BlockStorageCinderVolume
- OS::TripleO::Services::BootParams
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CinderBackendVRTSHyperScale
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Frr
- OS::TripleO::Services::IpaClient

1
sample-env-generator/undercloud-minion.yaml

@ -274,7 +274,6 @@ environments:
OS::TripleO::Services::UndercloudTLS: OS::Heat::None
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
OS::TripleO::Services::Vpp: OS::Heat::None
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
OS::TripleO::Services::Xinetd: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None
# Role specific dynamic parameters, to be defined here

Loading…
Cancel
Save