stackhpc · Alex-Welsh · Mar 20, 2023 · Feb 28, 2023 · Feb 28, 2023 · Feb 28, 2023
@@ -1,7 +1,7 @@
 ---
 - name: Configure VXLAN
   hosts: controllers,compute,seed,storage
-  gather_facts: false
+  gather_facts: true
   vars:
     ansible_user: "{{ bootstrap_user }}"
     # We can't assume that a virtualenv exists at this point, so use the system

@@ -2,7 +2,7 @@
 ###############################################################################
 # Network interface definitions for the compute group.
 
-admin_oc_interface: "eno1"
+admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"
 
 internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"
 

@@ -2,7 +2,7 @@
 ###############################################################################
 # Network interface definitions for the controller group.
 
-admin_oc_interface: "eno1"
+admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"
 
 internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"
 

@@ -4,12 +4,3 @@ kolla_enable_cinder_backup: true
 kolla_enable_neutron_provider_networks: true
 kolla_enable_ovn: true
 kolla_enable_octavia: true
-
-# Override these from etc/kayobe/kolla.yml
-# These are set to true within etc/kayobe/kolla.yml.
-# Leaving them set to true would require additional
-# configuration change.
-kolla_enable_central_logging: false
-kolla_enable_elasticsearch_curator: false
-kolla_enable_grafana: false
-kolla_enable_prometheus: false
@@ -15,6 +15,9 @@ nova_backend_ceph: "yes"
 neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
 neutron_external_interface: "{{ vxlan_interfaces[0].device }}"
 
+# Elasticsearch memory tuning
+es_heap_size: 1g
+
 # Octavia load balancer configuration
 octavia_auto_configure: "no"
 octavia_provider_drivers: "ovn:OVN provider"

@@ -73,7 +73,7 @@ storage_mgmt_net_name: storage_mgmt
 
 # Internal network
 internal_cidr: 192.168.37.0/24
-internal_mtu: 1450
+internal_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 internal_allocation_pool_start: 192.168.37.3
 internal_allocation_pool_end: 192.168.37.254
 internal_vip_address: 192.168.37.2
@@ -88,36 +88,36 @@ external_vlan: 102
 
 # Public network
 public_cidr: 192.168.39.0/24
-public_mtu: 1450
+public_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 public_allocation_pool_start: 192.168.39.3
 public_allocation_pool_end: 192.168.39.254
 public_vip_address: 192.168.39.2
 public_vlan: 103
 
 # Tunnel network
 tunnel_cidr: 192.168.40.0/24
-tunnel_mtu: 1450
+tunnel_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 tunnel_allocation_pool_start: 192.168.40.3
 tunnel_allocation_pool_end: 192.168.40.254
 tunnel_vlan: 104
 
 # Storage network
 storage_cidr: 192.168.41.0/24
-storage_mtu: 1450
+storage_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 storage_allocation_pool_start: 192.168.41.3
 storage_allocation_pool_end: 192.168.41.254
 storage_vlan: 105
 
 # Storage management network
 storage_mgmt_cidr: 192.168.42.0/24
-storage_mgmt_mtu: 1450
+storage_mgmt_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 storage_mgmt_allocation_pool_start: 192.168.42.3
 storage_mgmt_allocation_pool_end: 192.168.42.254
 storage_mgmt_vlan: 106
 
 # Provision overcloud network
 provision_oc_cidr: 192.168.33.0/24
-provision_oc_mtu: 1450
+provision_oc_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
 provision_oc_allocation_pool_start: 192.168.33.128
 provision_oc_allocation_pool_end: 192.168.33.254
 provision_oc_vlan: 107

@@ -8,3 +8,7 @@ seed_lvm_groups:
 seed_extra_network_interfaces:
   - "external"
   - "public"
+
+# Enable IP routing and source NAT on the seed, allowing it to be used as the
+# external subnet gateway and provide internet access for VMs in the deployment.
+seed_enable_snat: true
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Set monitoring services be enabled by default in the ``ci-multinode``
+    environment.
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds support for using a VMs as compute and controller nodes in the
+    ``ci-multinode`` environment by dynamically setting the MTU of the networks
+    in networks.yml and removing the static definition of the network
+    interfaces for the compute and controller groups. 
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes internet connectivity for VMs deployed in the ``ci-multinode``
+    environment.