Remove or fix outdated/incorrect neutron hieradata definitions
- neutron::server::qos_notification_drivers was deprecated in Ocata change: Ie95e8d07273d168da0fe9ae1635774b230683efa - neutron::server::placement::www_authenticate_uri is incorrect: neutron::server::placement::auth_url should be used instead and it is already defined - neutron::agents::ml2::networking_baremetal::username should be used instead of neutron::agents::ml2::networking_baremetal::user - neutron::agents::metadata::auth_password, neutron::agents::metadata::auth_url and neutron::agents::metadata::auth_tenant were deprecated in Newton change: I2c88f8523630ad0246785190f90b7a02fc704153 - neutron::agents::ovn_metadata::auth_password, neutron::agents::ovn_metadata::auth_url and neutron::agents::ovn_metadata::auth_tenant are likely artifacts that were not removed when service template for OVN Metadata service was copied from Neutron Metadata service definition. Partial-Bug: #1916386 Change-Id: Ib4d09589c8558fbd72c69a7b5b21bc9e0fc97f32
This commit is contained in:
parent
4ededdab3f
commit
02bb4b8aa0
@ -69,7 +69,7 @@ outputs:
|
|||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
- neutron::agents::ml2::networking_baremetal::user: 'ironic'
|
- neutron::agents::ml2::networking_baremetal::username: 'ironic'
|
||||||
- neutron::agents::ml2::networking_baremetal::password: {get_param: IronicPassword}
|
- neutron::agents::ml2::networking_baremetal::password: {get_param: IronicPassword}
|
||||||
- neutron::agents::ml2::networking_baremetal::auth_url: { get_param: [ EndpointMap, KeystoneInternal, uri_no_suffix ] }
|
- neutron::agents::ml2::networking_baremetal::auth_url: { get_param: [ EndpointMap, KeystoneInternal, uri_no_suffix ] }
|
||||||
- neutron::agents::ml2::networking_baremetal::project_name: 'service'
|
- neutron::agents::ml2::networking_baremetal::project_name: 'service'
|
||||||
|
@ -309,7 +309,6 @@ outputs:
|
|||||||
neutron::quota::quota_security_group: {get_param: NeutronSecurityGroupQuota}
|
neutron::quota::quota_security_group: {get_param: NeutronSecurityGroupQuota}
|
||||||
neutron::server::placement::region_name: {get_param: KeystoneRegion}
|
neutron::server::placement::region_name: {get_param: KeystoneRegion}
|
||||||
neutron::server::placement::password: {get_param: NovaPassword}
|
neutron::server::placement::password: {get_param: NovaPassword}
|
||||||
neutron::server::placement::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
|
||||||
neutron::server::placement::project_domain_name: 'Default'
|
neutron::server::placement::project_domain_name: 'Default'
|
||||||
neutron::server::placement::project_name: 'service'
|
neutron::server::placement::project_name: 'service'
|
||||||
neutron::server::placement::user_domain_name: 'Default'
|
neutron::server::placement::user_domain_name: 'Default'
|
||||||
|
@ -53,10 +53,6 @@ parameters:
|
|||||||
such systems it is recommended that a non-default value be selected that
|
such systems it is recommended that a non-default value be selected that
|
||||||
matches the load requirements.
|
matches the load requirements.
|
||||||
type: string
|
type: string
|
||||||
NeutronPassword:
|
|
||||||
description: The password for the neutron service and db account, used by neutron agents.
|
|
||||||
type: string
|
|
||||||
hidden: true
|
|
||||||
MonitoringSubscriptionNeutronMetadata:
|
MonitoringSubscriptionNeutronMetadata:
|
||||||
default: 'overcloud-neutron-metadata'
|
default: 'overcloud-neutron-metadata'
|
||||||
type: string
|
type: string
|
||||||
@ -109,10 +105,7 @@ outputs:
|
|||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
- get_attr: [NeutronLogging, config_settings]
|
- get_attr: [NeutronLogging, config_settings]
|
||||||
- neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
|
- neutron::agents::metadata::debug:
|
||||||
neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
|
||||||
neutron::agents::metadata::auth_tenant: 'service'
|
|
||||||
neutron::agents::metadata::debug:
|
|
||||||
if:
|
if:
|
||||||
- service_debug_unset
|
- service_debug_unset
|
||||||
- {get_param: Debug}
|
- {get_param: Debug}
|
||||||
|
@ -56,10 +56,6 @@ parameters:
|
|||||||
- log
|
- log
|
||||||
- off
|
- off
|
||||||
- repair
|
- repair
|
||||||
OVNQosDriver:
|
|
||||||
description: OVN notification driver for Neutron QOS service plugin
|
|
||||||
type: string
|
|
||||||
default: ovn-qos
|
|
||||||
NeutronGeneveMaxHeaderSize:
|
NeutronGeneveMaxHeaderSize:
|
||||||
description: Geneve encapsulation header size
|
description: Geneve encapsulation header size
|
||||||
type: number
|
type: number
|
||||||
@ -138,7 +134,6 @@ outputs:
|
|||||||
neutron::plugins::ml2::ovn::ovn_l3_mode: true
|
neutron::plugins::ml2::ovn::ovn_l3_mode: true
|
||||||
neutron::plugins::ml2::ovn::vif_type: {get_param: OVNVifType}
|
neutron::plugins::ml2::ovn::vif_type: {get_param: OVNVifType}
|
||||||
neutron::plugins::ml2::ovn::ovn_metadata_enabled: {get_param: OVNMetadataEnabled}
|
neutron::plugins::ml2::ovn::ovn_metadata_enabled: {get_param: OVNMetadataEnabled}
|
||||||
neutron::server::qos_notification_drivers: {get_param: OVNQosDriver}
|
|
||||||
neutron::server::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}
|
neutron::server::igmp_snooping_enable: {get_param: NeutronEnableIgmpSnooping}
|
||||||
neutron::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize}
|
neutron::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize}
|
||||||
neutron::plugins::ml2::ovn::dns_servers: {get_param: OVNDnsServers}
|
neutron::plugins::ml2::ovn::dns_servers: {get_param: OVNDnsServers}
|
||||||
|
@ -77,10 +77,6 @@ parameters:
|
|||||||
such systems it is recommended that a non-default value be selected that
|
such systems it is recommended that a non-default value be selected that
|
||||||
matches the load requirements.
|
matches the load requirements.
|
||||||
type: string
|
type: string
|
||||||
NeutronPassword:
|
|
||||||
description: The password for the neutron service and db account, used by neutron agents.
|
|
||||||
type: string
|
|
||||||
hidden: true
|
|
||||||
OVNSouthboundServerPort:
|
OVNSouthboundServerPort:
|
||||||
description: Port of the OVN Southbound DB server
|
description: Port of the OVN Southbound DB server
|
||||||
type: number
|
type: number
|
||||||
@ -177,9 +173,6 @@ outputs:
|
|||||||
- {get_param: OVNWrapperDebug}
|
- {get_param: OVNWrapperDebug}
|
||||||
tripleo::profile::base::neutron::container_cli: {get_param: ContainerCli}
|
tripleo::profile::base::neutron::container_cli: {get_param: ContainerCli}
|
||||||
neutron::agents::ovn_metadata::shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
neutron::agents::ovn_metadata::shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
||||||
neutron::agents::ovn_metadata::auth_password: {get_param: NeutronPassword}
|
|
||||||
neutron::agents::ovn_metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
|
||||||
neutron::agents::ovn_metadata::auth_tenant: 'service'
|
|
||||||
neutron::agents::ovn_metadata::metadata_host: {get_param: [EndpointMap, NovaMetadataCellInternal, host_nobrackets]}
|
neutron::agents::ovn_metadata::metadata_host: {get_param: [EndpointMap, NovaMetadataCellInternal, host_nobrackets]}
|
||||||
neutron::agents::ovn_metadata::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
|
neutron::agents::ovn_metadata::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
|
||||||
ovn::southbound::port: {get_param: OVNSouthboundServerPort}
|
ovn::southbound::port: {get_param: OVNSouthboundServerPort}
|
||||||
|
@ -18,7 +18,6 @@ parameter_defaults:
|
|||||||
NeutronMechanismDrivers: ovn
|
NeutronMechanismDrivers: ovn
|
||||||
OVNVifType: ovs
|
OVNVifType: ovs
|
||||||
OVNNeutronSyncMode: log
|
OVNNeutronSyncMode: log
|
||||||
OVNQosDriver: ovn-qos
|
|
||||||
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: 'geneve'
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
||||||
|
@ -17,7 +17,6 @@ parameter_defaults:
|
|||||||
NeutronMechanismDrivers: ovn
|
NeutronMechanismDrivers: ovn
|
||||||
OVNVifType: ovs
|
OVNVifType: ovs
|
||||||
OVNNeutronSyncMode: log
|
OVNNeutronSyncMode: log
|
||||||
OVNQosDriver: ovn-qos
|
|
||||||
NeutronEnableDVR: false
|
NeutronEnableDVR: false
|
||||||
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
||||||
NeutronNetworkType: 'geneve'
|
NeutronNetworkType: 'geneve'
|
||||||
|
@ -19,7 +19,6 @@ parameter_defaults:
|
|||||||
NeutronMechanismDrivers: ovn
|
NeutronMechanismDrivers: ovn
|
||||||
OVNVifType: ovs
|
OVNVifType: ovs
|
||||||
OVNNeutronSyncMode: log
|
OVNNeutronSyncMode: log
|
||||||
OVNQosDriver: ovn-qos
|
|
||||||
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
||||||
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
|
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
||||||
|
@ -17,7 +17,6 @@ parameter_defaults:
|
|||||||
NeutronMechanismDrivers: ovn
|
NeutronMechanismDrivers: ovn
|
||||||
OVNVifType: ovs
|
OVNVifType: ovs
|
||||||
OVNNeutronSyncMode: log
|
OVNNeutronSyncMode: log
|
||||||
OVNQosDriver: ovn-qos
|
|
||||||
NeutronEnableDVR: False
|
NeutronEnableDVR: False
|
||||||
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
||||||
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
|
NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
|
||||||
|
@ -19,7 +19,6 @@ parameter_defaults:
|
|||||||
NeutronMechanismDrivers: ovn
|
NeutronMechanismDrivers: ovn
|
||||||
OVNVifType: ovs
|
OVNVifType: ovs
|
||||||
OVNNeutronSyncMode: log
|
OVNNeutronSyncMode: log
|
||||||
OVNQosDriver: ovn-qos
|
|
||||||
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
|
||||||
NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
|
NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
|
||||||
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
# This environment file provides default previous values for ml2/ovs
|
# This environment file provides default previous values for ml2/ovs
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
OVNQosDriver: NULL
|
|
||||||
NeutronMechanismDrivers: 'openvswitch'
|
NeutronMechanismDrivers: 'openvswitch'
|
||||||
NeutronTypeDrivers: "vxlan,vlan,flat,gre"
|
NeutronTypeDrivers: "vxlan,vlan,flat,gre"
|
||||||
NeutronVniRanges: ["1:65536", ]
|
NeutronVniRanges: ["1:65536", ]
|
||||||
|
Loading…
Reference in New Issue
Block a user