Merge "Removes manila-generic-config from TripleO"

changes/42/500942/11
Zuul 5 years ago committed by Gerrit Code Review
commit a4877d7272
  1. 10
      capabilities-map.yaml
  2. 1
      deployed-server/deployed-server-roles-data.yaml
  3. 1
      environments/contrail/roles_data_contrail.yaml
  4. 24
      environments/manila-generic-config.yaml
  5. 1
      overcloud-resource-registry-puppet.j2.yaml
  6. 101
      puppet/services/manila-backend-generic.yaml
  7. 1
      roles/Controller.yaml
  8. 1
      roles/ControllerOpenstack.yaml
  9. 1
      roles_data.yaml

@ -538,16 +538,6 @@ topics:
- title:
description: Deploy additional services
environments:
- file: environments/services/manila-generic-config.yaml
title: Barbican
description: Enable Barbican with the default secret store backend
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/manila-generic-config.yaml
title: Manila
description: Enable Manila with generic driver backend
requires:
- overcloud-resource-registry-puppet.yaml
- file: environments/services/sahara.yaml
title: Sahara
description: Deploy Sahara service

@ -89,7 +89,6 @@
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::ManilaApi
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendIsilon
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity

@ -80,7 +80,6 @@
- OS::TripleO::Services::GnocchiStatsd
- OS::TripleO::Services::ManilaApi
- OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity
- OS::TripleO::Services::ManilaBackendIsilon

@ -1,24 +0,0 @@
# This environment file enables Manila with the Generic 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::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
parameter_defaults:
ManilaServiceInstanceUser: ''
ManilaServiceInstancePassword: ''
ManilaServiceInstanceFlavorId: 2
ManilaServiceNetworkCidr: '172.16.0.0/16'
ManilaGenericBackendName: tripleo_generic
ManilaGenericDriverHandlesShareServers: true
ManilaGenericSmbTemplateConfigPath: '$state_path/smb.conf'
ManilaGenericVolumeNameTemplate: 'manila-share-%s'
ManilaGenericVolumeSnapshotNameTemplate: 'manila-snapshot-%s'
ManilaGenericShareMountPath: '/shares'
ManilaGenericMaxTimeToCreateVolume: '180'
ManilaGenericMaxTimeToAttach: '120'
ManilaGenericServiceInstanceSmbConfigPath: '$share_mount_path/smb.conf'
ManilaGenericShareVolumeFsType: 'ext4'
ManilaGenericCinderVolumeType: ''

@ -239,7 +239,6 @@ resource_registry:
OS::TripleO::Services::ManilaApi: OS::Heat::None
OS::TripleO::Services::ManilaScheduler: OS::Heat::None
OS::TripleO::Services::ManilaShare: OS::Heat::None
OS::TripleO::Services::ManilaBackendGeneric: OS::Heat::None
OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None

@ -1,101 +0,0 @@
heat_template_version: pike
description: >
Openstack Manila generic backend.
parameters:
ManilaGenericBackendName:
type: string
default: tripleo_generic
ManilaGenericDriverHandlesShareServers:
type: string
default: true
ManilaGenericSmbTemplateConfigPath:
type: string
default: '$state_path/smb.conf'
ManilaGenericVolumeNameTemplate:
type: string
default: 'manila-share-%s'
ManilaGenericVolumeSnapshotNameTemplate:
type: string
default: 'manila-snapshot-%s'
ManilaGenericShareMountPath:
type: string
default: '/shares'
ManilaGenericMaxTimeToCreateVolume:
type: string
default: '180'
ManilaGenericMaxTimeToAttach:
type: string
default: '120'
ManilaGenericServiceInstanceSmbConfigPath:
type: string
default: '$share_mount_path/smb.conf'
ManilaGenericShareVolumeFsType:
type: string
default: 'ext4'
ManilaGenericCinderVolumeType:
type: string
default: ''
ManilaServiceInstanceUser:
type: string
default: ''
ManilaServiceInstancePassword: #SET THIS via parameter_defaults
type: string
hidden: true
ManilaServiceInstanceFlavorId:
type: number
default: 1
ManilaServiceNetworkCidr:
type: string
default: '172.16.0.0/16'
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 Generic backend.
value:
service_name: manila_backend_generic
config_settings:
manila::backend::generic::title: {get_param: ManilaGenericBackendName}
manila::backend::generic::driver_handles_share_servers: {get_param: ManilaGenericDriverHandlesShareServers}
manila::backend::generic::smb_template_config_path: {get_param: ManilaGenericSmbTemplateConfigPath}
manila::backend::generic::volume_name_template: {get_param: ManilaGenericVolumeNameTemplate}
manila::backend::generic::volume_snapshot_name_template: {get_param: ManilaGenericVolumeSnapshotNameTemplate}
manila::backend::generic::share_mount_path: {get_param: ManilaGenericShareMountPath}
manila::backend::generic::max_time_to_create_volume: {get_param: ManilaGenericMaxTimeToCreateVolume}
manila::backend::generic::max_time_to_attach: {get_param: ManilaGenericMaxTimeToAttach}
manila::backend::generic::service_instance_smb_config_path: {get_param: ManilaGenericServiceInstanceSmbConfigPath}
manila::backend::generic::share_volume_fstype: {get_param: ManilaGenericShareVolumeFsType}
manila::backend::generic::cinder_volume_type: {get_param: ManilaGenericCinderVolumeType}
manila::service_instance::service_instance_user: {get_param: ManilaServiceInstanceUser}
manila::service_instance::service_instance_password: {get_param: ManilaServiceInstancePassword}
manila::service_instance::service_instance_flavor_id: {get_param: ManilaServiceInstanceFlavorId}
manila::service_instance::service_network_cidr: {get_param: ManilaServiceNetworkCidr}
step_config:

@ -78,7 +78,6 @@
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::ManilaApi
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendIsilon
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity

@ -63,7 +63,6 @@
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::ManilaApi
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendIsilon
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity

@ -81,7 +81,6 @@
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::ManilaApi
- OS::TripleO::Services::ManilaBackendCephFs
- OS::TripleO::Services::ManilaBackendGeneric
- OS::TripleO::Services::ManilaBackendIsilon
- OS::TripleO::Services::ManilaBackendNetapp
- OS::TripleO::Services::ManilaBackendUnity

Loading…
Cancel
Save