Reworking the networking for OSP 13

Aligns with default generated networking without vlans.
rcbops · Sep 24, 2018 · 6534da7 · 6534da7
1 parent 36a985e
commit 6534da7
Show file tree

Hide file tree

Showing 17 changed files with 157 additions and 195 deletions.
diff --git a/playbooks/deploy-osp.yml b/playbooks/deploy-osp.yml
@@ -189,6 +189,9 @@
         - src: "osp/{{ redhat_osp_version }}/overcloud/ceph-custom-config.yaml.j2"
           dest: "/home/stack/templates/ceph-custom-config.yaml"
           mode: "0644"
+        - src: "osp/{{ redhat_osp_version }}/overcloud/network_data.yaml.j2"
+          dest: "/home/stack/templates/network_data.yaml"
+          mode: "0644"
 
     - name: Introspect servers
       shell: |

diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
@@ -71,24 +71,30 @@ mnaio_host_networks:
     inet_type: 'static'
     address: '10.0.236.1/22'
     iface_port: none
-  flat:
+  tenant:
     iface: 'vm-br-eth2'
     inet_type: 'static'
-    address: '10.0.248.1/22'
+    address: '172.16.0.1/24'
     iface_port: none
-  vlan:
+  internal_api:
     iface: 'vm-br-eth3'
-    inet_type: 'manual'
+    inet_type: 'static'
+    address: '172.16.2.1/24'
     iface_port: none
-  vxlan:
+  external:
     iface: 'vm-br-eth4'
     inet_type: 'static'
-    address: '10.0.240.1/22'
+    address: '10.0.0.0/24'
     iface_port: none
   storage:
     iface: 'vm-br-eth5'
     inet_type: 'static'
-    address: '10.0.244.1/22'
+    address: '172.16.1.1/24'
+    iface_port: none
+  storage_mgmt:
+    iface: 'vm-br-eth6'
+    inet_type: 'static'
+    address: '172.16.3.1/24'
     iface_port: none
 
 osa_enable_infra: true

diff --git a/playbooks/host_vars/ceph1.yml b/playbooks/host_vars/ceph1.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.130/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.130/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.130/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.130/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/ceph2.yml b/playbooks/host_vars/ceph2.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.131/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.131/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.131/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.131/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/ceph3.yml b/playbooks/host_vars/ceph3.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.132/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.132/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.132/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.132/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/compute1.yml b/playbooks/host_vars/compute1.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.120/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.120/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.120/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.120/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/compute2.yml b/playbooks/host_vars/compute2.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.121/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.121/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.121/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.121/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/controller1.yml b/playbooks/host_vars/controller1.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.101/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.101/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.101/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.101/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/controller2.yml b/playbooks/host_vars/controller2.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.102/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.102/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.102/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.102/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/controller3.yml b/playbooks/host_vars/controller3.yml
@@ -38,22 +38,23 @@ server_networks:
     inet_type: 'static'
     address: '10.0.236.110/22'
     vm_int_iface: vm-br-eth1
-  flat:
+  tenant:
     iface: 'eth2'
     inet_type: 'static'
-    address: '10.0.248.110/22'
     vm_int_iface: vm-br-eth2
-  vlan:
+  internal_api:
     iface: 'eth3'
     inet_type: 'manual'
     vm_int_iface: vm-br-eth3
-  vxlan:
+  external:
     iface: 'eth4'
     inet_type: 'static'
-    address: '10.0.240.110/22'
     vm_int_iface: vm-br-eth4
   storage:
     iface: 'eth5'
     inet_type: 'static'
-    address: '10.0.244.110/22'
     vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6
diff --git a/playbooks/host_vars/director.yml b/playbooks/host_vars/director.yml
@@ -29,33 +29,34 @@ server_preseed_ks: 'vm'                                     # str  - required, n
 server_extra_options: ''                                    # str  - not required, added kernel options
 server_virtual_bmc_port: '623'                              # int - virtualbmc port
 
-server_networks:                        # dict - required, hash of networks, can be empty, key is used to name the networks.
+server_networks:
   dhcp:
-    iface: 'eth0'                       # str  - required, interface name
-    inet_type: 'static'                 # str  - required, iface type [static, dhcp, manual]
+    iface: 'eth0'
+    inet_type: 'static' 
     address: '192.168.24.2/24'
-    vm_int_iface: vm-br-dhcp            # str  - not Required, used to specify an integration networks interface when provisioning a VM
+    vm_int_iface: vm-br-dhcp
   mgmt:
-    iface: 'eth1'                       # str  - required, interface name
-    inet_type: 'static'                 # str  - required, iface type [static, dhcp, manual]
-    address: '10.0.236.100/22'          # str  - not required, must be in CIDR format
-    vm_int_iface: vm-br-eth1            # str  - not Required, used to specify an integration networks interface when provisioning a VM
-  flat:
-    iface: 'eth2'                       # str  - required, interface name
-    inet_type: 'static'                 # str  - required, iface type [static, dhcp, manual]
-    address: '10.0.248.100/22'          # str  - not required, must be in CIDR format
-    vm_int_iface: vm-br-eth2            # str  - not Required, used to specify an integration networks interface when provisioning a VM
-  vlan:
-    iface: 'eth3'                       # str  - required, interface name
-    inet_type: 'manual'                 # str  - required, iface type [static, dhcp, manual]
-    vm_int_iface: vm-br-eth3            # str  - not Required, used to specify an integration networks interface when provisioning a VM
-  vxlan:
-    iface: 'eth4'                       # str  - required, interface name
-    inet_type: 'static'                 # str  - required, iface type [static, dhcp, manual]
-    address: '10.0.240.100/22'          # str  - not required, must be in CIDR format
-    vm_int_iface: vm-br-eth4            # str  - not Required, used to specify an integration networks interface when provisioning a VM
+    iface: 'eth1'
+    inet_type: 'static'
+    address: '10.0.236.100/22'
+    vm_int_iface: vm-br-eth1
+  tenant:
+    iface: 'eth2'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth2
+  internal_api:
+    iface: 'eth3'
+    inet_type: 'manual'
+    vm_int_iface: vm-br-eth3
+  external:
+    iface: 'eth4'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth4
   storage:
-    iface: 'eth5'                       # str  - required, interface name
-    inet_type: 'static'                 # str  - required, iface type [static, dhcp, manual]
-    address: '10.0.244.100/22'          # str  - not required, must be in CIDR format
-    vm_int_iface: vm-br-eth5            # str  - not Required, used to specify an integration networks interface when provisioning a VM
+    iface: 'eth5'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth5
+  storage_mgmt:
+    iface: 'eth6'
+    inet_type: 'static'
+    vm_int_iface: vm-br-eth6