Merge "Remove or fix outdated/incorrect neutron hieradata definitions"

2021-06-21 10:57:09 +00:00 · 2021-06-21 10:57:09 +00:00 · a2b72c70ee
parent 66e5fa87f7 02bb4b8aa0
commit a2b72c70ee
11 changed files with 2 additions and 28 deletions
--- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
+++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml
@ -68,7 +68,7 @@ outputs:
      config_settings:
        map_merge:
          - 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::auth_url: { get_param: [ EndpointMap, KeystoneInternal, uri_no_suffix ] }
          - neutron::agents::ml2::networking_baremetal::project_name: 'service'
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@ -311,7 +311,6 @@ outputs:
            neutron::quota::quota_port: {get_param: NeutronPortQuota}
            neutron::quota::quota_security_group: {get_param: NeutronSecurityGroupQuota}
            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_name: 'service'
            neutron::server::placement::user_domain_name: 'Default'
--- a/deployment/neutron/neutron-metadata-container-puppet.yaml
+++ b/deployment/neutron/neutron-metadata-container-puppet.yaml
@ -53,10 +53,6 @@ parameters:
      such systems it is recommended that a non-default value be selected that
      matches the load requirements.
    type: string
-  NeutronPassword:
-    description: The password for the neutron service and db account, used by neutron agents.
-    type: string
-    hidden: true
  MonitoringSubscriptionNeutronMetadata:
    default: 'overcloud-neutron-metadata'
    type: string
@ -106,10 +102,7 @@ outputs:
        map_merge:
          - get_attr: [NeutronBase, role_data, config_settings]
          - get_attr: [NeutronLogging, config_settings]
-          - neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
-            neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
-            neutron::agents::metadata::auth_tenant: 'service'
-            neutron::agents::metadata::debug:
+          - neutron::agents::metadata::debug:
                if:
                - {get_param: NeutronMetadataAgentDebug}
                - true
--- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml
+++ b/deployment/neutron/neutron-plugin-ml2-ovn.yaml
@ -48,10 +48,6 @@ parameters:
          - log
          - off
          - repair
-  OVNQosDriver:
-    description: OVN notification driver for Neutron QOS service plugin
-    type: string
-    default: ovn-qos
  NeutronGeneveMaxHeaderSize:
    description: Geneve encapsulation header size
    type: number
@ -128,7 +124,6 @@ outputs:
            neutron::plugins::ml2::ovn::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
            neutron::plugins::ml2::ovn::neutron_sync_mode: {get_param: OVNNeutronSyncMode}
            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::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize}
            neutron::plugins::ml2::ovn::dns_servers: {get_param: OVNDnsServers}
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@ -77,10 +77,6 @@ parameters:
      such systems it is recommended that a non-default value be selected that
      matches the load requirements.
    type: string
-  NeutronPassword:
-    description: The password for the neutron service and db account, used by neutron agents.
-    type: string
-    hidden: true
  OVNSouthboundServerPort:
    description: Port of the OVN Southbound DB server
    type: number
@ -168,9 +164,6 @@ outputs:
                - {get_param: Debug}
            tripleo::profile::base::neutron::container_cli: {get_param: ContainerCli}
            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::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
            ovn::southbound::port: {get_param: OVNSouthboundServerPort}
--- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml
@ -17,7 +17,6 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ovn
  OVNNeutronSyncMode: log
-  OVNQosDriver: ovn-qos
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
  NeutronNetworkType: 'geneve'
  NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
--- a/environments/services-baremetal/neutron-ovn-ha.yaml
+++ b/environments/services-baremetal/neutron-ovn-ha.yaml
@ -16,7 +16,6 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ovn
  OVNNeutronSyncMode: log
-  OVNQosDriver: ovn-qos
  NeutronEnableDVR: false
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
  NeutronNetworkType: 'geneve'
--- a/environments/services/neutron-ovn-dvr-ha.yaml
+++ b/environments/services/neutron-ovn-dvr-ha.yaml
@ -18,7 +18,6 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ovn
  OVNNeutronSyncMode: log
-  OVNQosDriver: ovn-qos
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
  NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
  NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
--- a/environments/services/neutron-ovn-ha.yaml
+++ b/environments/services/neutron-ovn-ha.yaml
@ -16,7 +16,6 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ovn
  OVNNeutronSyncMode: log
-  OVNQosDriver: ovn-qos
  NeutronEnableDVR: False
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
  NeutronNetworkType: ['geneve' , 'vxlan', 'vlan', 'flat']
--- a/environments/services/neutron-ovn-standalone.yaml
+++ b/environments/services/neutron-ovn-standalone.yaml
@ -18,7 +18,6 @@ resource_registry:
 parameter_defaults:
  NeutronMechanismDrivers: ovn
  OVNNeutronSyncMode: log
-  OVNQosDriver: ovn-qos
  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat'
  NeutronNetworkType: ['geneve', 'vxlan', 'vlan', 'flat']
  NeutronServicePlugins: 'qos,ovn-router,trunk,segments,port_forwarding,log'
--- a/environments/updates/update-from-ml2-ovs-from-rocky.yaml
+++ b/environments/updates/update-from-ml2-ovs-from-rocky.yaml
@ -1,7 +1,6 @@
 # This environment file provides default previous values for ml2/ovs

 parameter_defaults:
-  OVNQosDriver: NULL
  NeutronMechanismDrivers: 'openvswitch'
  NeutronTypeDrivers: "vxlan,vlan,flat,gre"
  NeutronVniRanges: ["1:65536", ]