Merge pull request #673 from gmarcian/unibeta_split_masters_workers

[uni02beta] Decouple master and worker nodes on uni02beta DT 

This change updates the uni02beta deployed topology to decouple OpenShift cluster from OpenStack control-plane workloads. This should allow executing HA disruptive tests on the Openstack control-plane nodes with no risk to break or affect the Openshift cluster.
The target layout is:
3 OCP master nodes dedicated to the OpenShift cluster
3 OCP worker nodes dedicated to the OpenStack control plane
1 additional worker node dedicated to running the Test Operator (not changed)

Reviewed-by: Andrew Bays <andrew.bays@gmail.com>
Reviewed-by: Arx Cruz

Author: softwarefactory-project-zuul[bot]

automation/net-env/uni02beta-adoption.yaml

@@ -387,7 +387,7 @@ instances:
       storage:
         interface_name: enp6s0.121
         ip_v4: 172.18.0.13
-        mac_addr: "52:54:00:23:e0:fg"
+        mac_addr: "52:54:00:23:e0:10"
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
@@ -406,6 +406,180 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+
+  ocp-4:
+    hostname: osasinfra-worker-1
+    name: ocp-4
+    networks:
+      ctlplane:
+        interface_name: enp6s0
+        ip_v4: 192.168.122.14
+        mac_addr: "52:54:00:de:3d:97"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: ctlplane
+        prefix_length_v4: 24
+        skip_nm: false
+      internalapi:
+        interface_name: enp6s0.120
+        ip_v4: 172.17.0.14
+        mac_addr: "52:54:00:63:20:1e"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: internalapi
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 120
+      octavia:
+        interface_name: enp6s0.124
+        ip_v4: 172.23.0.14
+        mac_addr: "52:54:00:1e:24:18"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 124
+      storage:
+        interface_name: enp6s0.121
+        ip_v4: 172.18.0.14
+        mac_addr: "52:54:00:23:e0:11"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storage
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 121
+      tenant:
+        interface_name: enp6s0.122
+        ip_v4: 172.19.0.14
+        mac_addr: "52:54:00:29:56:12"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: tenant
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 122
+
+  ocp-5:
+    hostname: osasinfra-worker-2
+    name: ocp-5
+    networks:
+      ctlplane:
+        interface_name: enp6s0
+        ip_v4: 192.168.122.15
+        mac_addr: "52:54:00:de:3d:98"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: ctlplane
+        prefix_length_v4: 24
+        skip_nm: false
+      internalapi:
+        interface_name: enp6s0.120
+        ip_v4: 172.17.0.15
+        mac_addr: "52:54:00:63:20:1f"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: internalapi
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 120
+      octavia:
+        interface_name: enp6s0.124
+        ip_v4: 172.23.0.15
+        mac_addr: "52:54:00:1e:24:19"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 124
+      storage:
+        interface_name: enp6s0.121
+        ip_v4: 172.18.0.15
+        mac_addr: "52:54:00:23:e0:12"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storage
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 121
+      tenant:
+        interface_name: enp6s0.122
+        ip_v4: 172.19.0.15
+        mac_addr: "52:54:00:29:56:13"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: tenant
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 122
+
+  ocp-6:
+    hostname: osasinfra-worker-3
+    name: ocp-6
+    networks:
+      ctlplane:
+        interface_name: enp6s0
+        ip_v4: 192.168.122.16
+        mac_addr: "52:54:00:de:3d:99"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: ctlplane
+        prefix_length_v4: 24
+        skip_nm: false
+      internalapi:
+        interface_name: enp6s0.120
+        ip_v4: 172.17.0.16
+        mac_addr: "52:54:00:63:20:20"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: internalapi
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 120
+      octavia:
+        interface_name: enp6s0.124
+        ip_v4: 172.23.0.16
+        mac_addr: "52:54:00:1e:24:1a"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 124
+      storage:
+        interface_name: enp6s0.121
+        ip_v4: 172.18.0.16
+        mac_addr: "52:54:00:23:e0:13"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storage
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 121
+      tenant:
+        interface_name: enp6s0.122
+        ip_v4: 172.19.0.16
+        mac_addr: "52:54:00:29:56:14"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: tenant
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 122
   networker-0:
     hostname: networker-0
     name: networker-0

automation/net-env/uni02beta.yaml

@@ -387,7 +387,7 @@ instances:
       storage:
         interface_name: enp6s0.121
         ip_v4: 172.18.0.13
-        mac_addr: "52:54:00:23:e0:fg"
+        mac_addr: "52:54:00:23:e0:10"
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
@@ -406,6 +406,177 @@ instances:
         prefix_length_v4: 24
         skip_nm: false
         vlan_id: 122
+  ocp-4:
+    hostname: osasinfra-worker-1
+    name: ocp-4
+    networks:
+      ctlplane:
+        interface_name: enp6s0
+        ip_v4: 192.168.122.14
+        mac_addr: "52:54:00:de:3d:97"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: ctlplane
+        prefix_length_v4: 24
+        skip_nm: false
+      internalapi:
+        interface_name: enp6s0.120
+        ip_v4: 172.17.0.14
+        mac_addr: "52:54:00:63:20:1e"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: internalapi
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 120
+      octavia:
+        interface_name: enp6s0.124
+        ip_v4: 172.23.0.14
+        mac_addr: "52:54:00:1e:24:18"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 124
+      storage:
+        interface_name: enp6s0.121
+        ip_v4: 172.18.0.14
+        mac_addr: "52:54:00:23:e0:11"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storage
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 121
+      tenant:
+        interface_name: enp6s0.122
+        ip_v4: 172.19.0.14
+        mac_addr: "52:54:00:29:56:12"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: tenant
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 122
+  ocp-5:
+    hostname: osasinfra-worker-2
+    name: ocp-5
+    networks:
+      ctlplane:
+        interface_name: enp6s0
+        ip_v4: 192.168.122.15
+        mac_addr: "52:54:00:de:3d:98"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: ctlplane
+        prefix_length_v4: 24
+        skip_nm: false
+      internalapi:
+        interface_name: enp6s0.120
+        ip_v4: 172.17.0.15
+        mac_addr: "52:54:00:63:20:1f"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: internalapi
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 120
+      octavia:
+        interface_name: enp6s0.124
+        ip_v4: 172.23.0.15
+        mac_addr: "52:54:00:1e:24:19"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 124
+      storage:
+        interface_name: enp6s0.121
+        ip_v4: 172.18.0.15
+        mac_addr: "52:54:00:23:e0:12"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storage
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 121
+      tenant:
+        interface_name: enp6s0.122
+        ip_v4: 172.19.0.15
+        mac_addr: "52:54:00:29:56:13"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: tenant
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 122
+  ocp-6:
+    hostname: osasinfra-worker-3
+    name: ocp-6
+    networks:
+      ctlplane:
+        interface_name: enp6s0
+        ip_v4: 192.168.122.16
+        mac_addr: "52:54:00:de:3d:99"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: ctlplane
+        prefix_length_v4: 24
+        skip_nm: false
+      internalapi:
+        interface_name: enp6s0.120
+        ip_v4: 172.17.0.16
+        mac_addr: "52:54:00:63:20:20"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: internalapi
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 120
+      octavia:
+        interface_name: enp6s0.124
+        ip_v4: 172.23.0.16
+        mac_addr: "52:54:00:1e:24:1a"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 124
+      storage:
+        interface_name: enp6s0.121
+        ip_v4: 172.18.0.16
+        mac_addr: "52:54:00:23:e0:13"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: storage
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 121
+      tenant:
+        interface_name: enp6s0.122
+        ip_v4: 172.19.0.16
+        mac_addr: "52:54:00:29:56:14"
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: tenant
+        parent_interface: enp6s0
+        prefix_length_v4: 24
+        skip_nm: false
+        vlan_id: 122
   networker-0:
     hostname: networker-0
     name: networker-0