Merge pull request #1171 from fyanac/update_net_eta

Add neutron config and update external network unieta adoption

Author: openshift-merge-bot[bot]

scenarios/uni07eta/config_download.yaml

@@ -11,6 +11,9 @@ resource_registry:
   OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
   OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
   OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
+  OS::TripleO::Networker::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
+  OS::TripleO::Networker::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
+  OS::TripleO::Networker::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
   OS::TripleO::Services::CeilometerAgentCentral: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentNotification: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
@@ -45,14 +48,18 @@ parameter_defaults:
   ComputeExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::virt_type: qemu
+  ExtraConfig:
+    neutron::notification_driver: 'noop'
+    neutron::plugins::ml2::path_mtu: 1500
+    neutron::plugins::ml2::ovn::ovn_router_indirect_snat: true
   BarbicanSimpleCryptoGlobalDefault: true
   Debug: true
   DockerPuppetDebug: true
   ContainerCli: podman
   ControllerCount: 3
   ComputeCount: 2
   NetworkerCount: 3
-  NeutronGlobalPhysnetMtu: 1350
+  NeutronGlobalPhysnetMtu: 1500
   CinderLVMLoopDeviceSize: 20480
   CloudName: overcloud.example.com
   CloudNameInternal: overcloud.internalapi.example.com
@@ -61,6 +68,14 @@ parameter_defaults:
   CloudNameCtlplane: overcloud.ctlplane.example.com
   CloudDomain: example.com
   NetworkConfigWithAnsible: false
+  EnableVLANTransparency: true
+  NeutronEnableIgmpSnooping: true
+  OVNEmitNeedToFrag: true
+  NeutronEnableDVR: true
+  NeutronTypeDrivers: 'geneve,vxlan,vlan,flat,local'
+  NeutronNetworkType: 'geneve,flat,vlan'
+  NeutronDnsDomain: 'example.com'
+  NeutronRouterSchedulerDriver: 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler'
   ControllerHostnameFormat: '%stackname%-controller-%index%'
   ComputeHostnameFormat: '%stackname%-compute-%index%'
   NetworkerHostnameFormat: '%stackname%-networker-%index%'

scenarios/uni07eta/network_data.yaml.j2

@@ -41,7 +41,7 @@
   name_lower: octavia
   dns_domain: octavia.{{ cloud_domain }}.
   subnets:
-    octavie_subnet:
+    octavia_subnet:
       ip_subnet: 172.23.0.0/24
       allocation_pools:
         - start: 172.23.0.200
@@ -55,6 +55,6 @@
   service_net_map_replace: external
   subnets:
     external_subnet:
-      vlan: 44
-      ip_subnet: '10.0.0.0/24'
-      allocation_pools: [{'start': '10.0.0.150', 'end': '10.0.0.250'}]
+      vlan: 218
+      ip_subnet: '172.38.0.0/24'
+      allocation_pools: [{'start': '172.38.0.50', 'end': '172.38.0.80'}]

scenarios/uni07eta/roles.yaml

@@ -260,6 +260,8 @@
       subnet: internal_api_subnet
     Tenant:
       subnet: tenant_subnet
+    External:
+      subnet: external_subnet
   tags:
     - external_bridge
   RoleParametersDefault:

scenarios/uni07eta/undercloud_parameter_defaults.yaml

@@ -1,14 +1,5 @@
 ---
 {
-    "parameter_defaults": {
-        "MasqueradeNetworks": {
-            "10.0.0.1/24": [
-                "10.0.0.1/24"
-            ],
-            "192.168.122.0/24": [
-                "192.168.122.0/24"
-            ]
-        }
-    },
+    "parameter_defaults": {},
     "resource_registry": {}
 }

scenarios/uni07eta/vips_data.yaml

@@ -13,6 +13,6 @@
   dns_name: overcloud
 - name: ctlplane_vip
   network: ctlplane
-  ip_address: 192.168.122.101
+  ip_address: 192.168.122.99
   subnet: ctlplane-subnet
   dns_name: overcloud