openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove support for networking-ansible"

This commit is contained in:
Zuul 2022-11-24 19:33:34 +00:00 committed by Gerrit Code Review
parent f484639674 3626ac3dfb
commit 2de85e121b
8 changed files with 5 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario000-standalone.yaml
View File

@ -102,7 +102,6 @@ resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None

4
ci/environments/scenario012-standalone.yaml
View File

@ -6,7 +6,6 @@ resource_registry:
OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
OS::TripleO::NodeExtraConfigPost: ../common/ironic_standalone_post.yaml
OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
OS::TripleO::Services::NovaCompute: OS::Heat::None
OS::TripleO::Services::NovaLibvirt: OS::Heat::None
@ -19,7 +18,7 @@ parameter_defaults:
SwiftCeilometerPipelineEnabled: false
IronicCleaningDiskErase: 'metadata'
NovaSchedulerDiscoverHostsInCellsInterval: 15
NeutronMechanismDrivers: ovn,ansible
NeutronMechanismDrivers: ovn
NeutronNetworkType: vlan
NeutronTypeDrivers: local,geneve,vlan,flat
DhcpAgentNotification: true
@ -28,4 +27,3 @@ parameter_defaults:
IronicAutomatedClean: false
NeutronFlatNetworks: datacentre
NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399'
ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}}

87
deployment/deprecated/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
View File

@ -1,87 +0,0 @@
heat_template_version: wallaby
description: >
Neutron ML2 networking-ansible Plugin (Docker)
parameters:
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
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. Use
parameter_merge_strategies to merge it with the defaults.
type: json
ContainerNeutronConfigImage:
description: The container image to use for the neutron config_volume
type: string
tags:
- role_specific
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
ML2HostConfigs:
description: ML2 config for switches
default: {}
type: json
RedisPassword:
description: The password for the redis service account.
type: string
hidden: true
resources:
NeutronMl2Base:
type: OS::TripleO::Services::NeutronMl2PluginBase
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
RoleParametersValue:
type: OS::Heat::Value
properties:
type: json
value:
map_replace:
- map_replace:
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
- values: {get_param: [RoleParameters]}
- values:
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
outputs:
role_data:
description: Role data for the Neutron ML2 ansible Plugin role.
value:
service_name: neutron_plugin_ml2_ansible
config_settings:
map_merge:
- get_attr: [NeutronMl2Base, role_data, config_settings]
- neutron::plugins::ml2::networking_ansible::host_configs: {get_param: ML2HostConfigs}
- neutron_redis_password: {get_param: RedisPassword}
service_config_settings: {}
metadata_settings:
get_attr: [NeutronMl2Base, role_data, metadata_settings]
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: 'neutron'
puppet_tags: neutron_plugin_ml2
step_config: |
include tripleo::profile::base::neutron::plugins::ml2
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
kolla_config: {}
docker_config: {}

1
environments/disable-neutron.yaml
View File

@ -6,7 +6,6 @@ resource_registry:
OS::TripleO::Services::NeutronApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None

11
environments/neutron-ml2-ansible.yaml
View File

@ -1,11 +0,0 @@
# A Heat environment file which can be used to enable network-ansible ML2 mechanism driver
# NOTE: Support for networking-ansible has been deprecated and will be removed after Z release.
resource_registry:
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
parameter_defaults:
IronicApiMaxRetries: 180
IronicDefaultNetworkInterface: neutron
NeutronMechanismDrivers: ovn,ansible
NeutronTypeDrivers: local,geneve,vlan,flat
NeutronNetworkType: vlan

11
environments/services/neutron-ml2-ansible.yaml
View File

@ -1,11 +0,0 @@
# A Heat environment file which can be used to enable network-ansible ML2 mechanism driver
# NOTE: Support for networking-ansible has been deprecated and will be removed after Z release.
resource_registry:
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
parameter_defaults:
IronicApiMaxRetries: 180
IronicDefaultNetworkInterface: neutron
NeutronMechanismDrivers: ovn,ansible
NeutronTypeDrivers: local,geneve,vlan,flat
NeutronNetworkType: vlan

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

@ -142,7 +142,6 @@ resource_registry:
OS::TripleO::Services::NeutronCorePluginMLNXSDN: deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
OS::TripleO::Services::NeutronCorePluginVTS: deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml
OS::TripleO::Services::NeutronCorePluginML2Ansible: deployment/deprecated/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None

4
releasenotes/notes/remove-networking-ansible-c3fca3209b864aa0.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Support for the ``networking-ansible`` plugin has been removed.