Merge "Remove plumgrid support"
This commit is contained in:
commit
505b43dfed
|
@ -248,11 +248,6 @@ topics:
|
|||
description: Enables DVR in the Overcloud
|
||||
requires:
|
||||
- overcloud-resource-registry-puppet.yaml
|
||||
- file: environments/neutron-plumgrid.yaml
|
||||
title: PLUMgrid extensions
|
||||
description: Enables PLUMgrid extensions
|
||||
requires:
|
||||
- overcloud-resource-registry-puppet.yaml
|
||||
- file: environments/neutron-ml2-fujitsu-cfab.yaml
|
||||
title: Fujitsu Neutron plugin for C-Fabric
|
||||
description: Enable C-Fabric in the overcloud
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
heat_template_version: rocky
|
||||
|
||||
description: >
|
||||
OpenStack Neutron Compute Plumgrid plugin
|
||||
|
||||
parameters:
|
||||
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: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron Compute Plumgrid plugin
|
||||
value:
|
||||
service_name: neutron_compute_plugin_plumgrid
|
||||
config_settings:
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plumgrid
|
|
@ -1,135 +0,0 @@
|
|||
heat_template_version: rocky
|
||||
|
||||
description: >
|
||||
OpenStack Neutron Plumgrid plugin
|
||||
|
||||
parameters:
|
||||
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: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
NeutronPassword:
|
||||
description: The password for the neutron service and db account, used by neutron agents.
|
||||
type: string
|
||||
hidden: true
|
||||
NeutronMetadataProxySharedSecret:
|
||||
description: Shared secret to prevent spoofing
|
||||
type: string
|
||||
hidden: true
|
||||
AdminPassword:
|
||||
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
|
||||
type: string
|
||||
hidden: true
|
||||
|
||||
# PLUMgrid specific settings
|
||||
PLUMgridDirectorServer:
|
||||
description: IP address of the PLUMgrid Director Server
|
||||
type: string
|
||||
default: 127.0.0.1
|
||||
PLUMgridDirectorServerPort:
|
||||
description: Port of the PLUMgrid Director Server
|
||||
type: string
|
||||
default: 443
|
||||
PLUMgridUsername:
|
||||
description: Username for PLUMgrid platform
|
||||
type: string
|
||||
PLUMgridPassword:
|
||||
description: Password for PLUMgrid platform
|
||||
type: string
|
||||
hidden: true
|
||||
PLUMgridNovaMetadataIP:
|
||||
description: IP address of Nova Metadata
|
||||
type: string
|
||||
default: 169.254.169.254
|
||||
PLUMgridNovaMetadataPort:
|
||||
description: Port of Nova Metadata
|
||||
type: string
|
||||
default: 8775
|
||||
PLUMgridL2GatewayVendor:
|
||||
description: Vendor for L2 Gateway Switch
|
||||
type: string
|
||||
default: vendor
|
||||
PLUMgridL2GatewayUsername:
|
||||
description: Username for L2 Gateway Switch
|
||||
type: string
|
||||
default: username
|
||||
PLUMgridL2GatewayPassword:
|
||||
description: Password for L2 Gateway Switch
|
||||
type: string
|
||||
hidden: true
|
||||
PLUMgridIdentityVersion:
|
||||
description: Keystone Identity version
|
||||
type: string
|
||||
default: v2.0
|
||||
PLUMgridConnectorType:
|
||||
description: Neutron Network Connector Type
|
||||
type: string
|
||||
default: distributed
|
||||
PLUMgridNeutronPluginVersion:
|
||||
description: PLUMgrid Neutron Plugin version
|
||||
type: string
|
||||
default: present
|
||||
PLUMgridPlumlibVersion:
|
||||
description: PLUMgrid Plumlib version
|
||||
type: string
|
||||
default: present
|
||||
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron Plumgrid plugin
|
||||
value:
|
||||
service_name: neutron_plugin_plumgrid
|
||||
config_settings:
|
||||
neutron::plugins::plumgrid::connection:
|
||||
make_url:
|
||||
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
||||
username: neutron
|
||||
password: {get_param: NeutronPassword}
|
||||
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
||||
path: /ovs_neutron
|
||||
query:
|
||||
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
||||
read_default_group: tripleo
|
||||
neutron::plugins::plumgrid::controller_priv_host: {get_param: [EndpointMap, KeystoneInternal, host]}
|
||||
neutron::plugins::plumgrid::admin_password: {get_param: AdminPassword}
|
||||
neutron::plugins::plumgrid::metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
||||
neutron::plugins::plumgrid::director_server: {get_param: PLUMgridDirectorServer}
|
||||
neutron::plugins::plumgrid::director_server_port: {get_param: PLUMgridDirectorServerPort}
|
||||
neutron::plugins::plumgrid::username: {get_param: PLUMgridUsername}
|
||||
neutron::plugins::plumgrid::password: {get_param: PLUMgridPassword}
|
||||
neutron::plugins::plumgrid::nova_metadata_ip: {get_param: PLUMgridNovaMetadataIP}
|
||||
neutron::plugins::plumgrid::nova_metadata_host: {get_param: PLUMgridNovaMetadataIP}
|
||||
neutron::plugins::plumgrid::nova_metadata_port: {get_param: PLUMgridNovaMetadataPort}
|
||||
neutron::plugins::plumgrid::l2gateway_vendor: {get_param: PLUMgridL2GatewayVendor}
|
||||
neutron::plugins::plumgrid::l2gateway_sw_username: {get_param: PLUMgridL2GatewayUsername}
|
||||
neutron::plugins::plumgrid::l2gateway_sw_password: {get_param: PLUMgridL2GatewayPassword}
|
||||
neutron::plugins::plumgrid::connector_type: {get_param: PLUMgridConnectorType}
|
||||
neutron::plugins::plumgrid::identity_version: {get_param: PLUMgridIdentityVersion}
|
||||
neutron::plugins::plumgrid::package_ensure: {get_param: PLUMgridNeutronPluginVersion}
|
||||
neutron::plugins::plumgrid::plumlib_package_ensure: {get_param: PLUMgridPlumlibVersion}
|
||||
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plugins::plumgrid
|
|
@ -1,31 +0,0 @@
|
|||
# A Heat environment file which can be used to enable PLUMgrid
|
||||
# extensions, configured via puppet
|
||||
resource_registry:
|
||||
# PLUMgrid doesn't require dhcp, l3, metadata, and ovs agents
|
||||
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
||||
# Override the Neutron core plugin to use PLUMgrid
|
||||
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginPlumgrid
|
||||
OS::TripleO::Services::ComputeNeutronCorePlugin: ../deployment/neutron/neutron-compute-plugin-plumgrid.yaml
|
||||
|
||||
parameter_defaults:
|
||||
NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2
|
||||
PLUMgridDirectorServer: 127.0.0.1
|
||||
PLUMgridDirectorServerPort: 443
|
||||
PLUMgridUsername: username
|
||||
PLUMgridPassword: password
|
||||
PLUMgridServerTimeOut: 99
|
||||
PLUMgridNovaMetadataIP: 169.254.169.254
|
||||
PLUMgridNovaMetadataPort: 8775
|
||||
PLUMgridL2GatewayVendor: vendor
|
||||
PLUMgridL2GatewayUsername: username
|
||||
PLUMgridL2GatewayPassword: password
|
||||
PLUMgridIdentityVersion: v2.0
|
||||
PLUMgridConnectorType: distributed
|
||||
|
||||
#Optional Parameters
|
||||
#PLUMgridNeutronPluginVersion: present
|
||||
#PLUMgridPlumlibVersion: present
|
|
@ -158,7 +158,6 @@ resource_registry:
|
|||
OS::TripleO::Services::NeutronCorePluginMidonet: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginNuage: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginPlumgrid: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None
|
||||
|
|
|
@ -154,7 +154,6 @@ resource_registry:
|
|||
OS::TripleO::Services::ComputeNeutronCorePluginNuage: deployment/neutron/neutron-compute-plugin-nuage.yaml
|
||||
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
|
||||
OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml
|
||||
OS::TripleO::Services::NeutronCorePluginPlumgrid: deployment/neutron/neutron-plugin-plumgrid.yaml
|
||||
OS::TripleO::Services::NeutronCorePluginNuage: deployment/neutron/neutron-plugin-nuage.yaml
|
||||
OS::TripleO::Services::NeutronCorePluginML2Nuage: deployment/neutron/neutron-plugin-ml2-nuage.yaml
|
||||
OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
|
||||
|
|
|
@ -181,7 +181,6 @@ environments:
|
|||
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginNuage: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginPlumgrid: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None
|
||||
|
|
Loading…
Reference in New Issue