apply new network configuration

going forward, eth0 and eth1 (which on our physical machines will be two 1Gb interfaces) are no longer used. Move storage to eth3, and everything else stays on eth2.
CCI-MOC · Jun 21, 2018 · 9302dd9 · 9302dd9
1 parent 491b494
commit 9302dd9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -14,14 +14,15 @@ This configuration will provision:
 
 | Interface | VLAN | Tagged | CIDR              | DHCP? | Description         | Director network |
 |-----------|------|--------|-------------------|-------|---------------------|------------------|
-| eth0      | 4014 | N      |                   | Y     | foreman provisioning network | |
-| eth1      | ?    | N      |                   | Y     | bmi provisioning network | |
-| eth1      | 3700 | Y      | 192.168.16.0/22   | N     | ceph public network | Storage |
+| eth0      | ? |        |                   |       | unused  ||
+| eth1      | ? |        |                   |       | unused  ||
+| eth2      | 3699    | N      |                   | Y     | foreman provisioning network | |
 | eth2      | 105  | Y      | 192.12.185.0/24   | N     | public API/horizon | External |
 | eth2      | 3702 | Y      | 192.168.32.0/22   | N     | openstack api network | InternalApi |
 | eth2      | 3703 | Y      | 192.168.24.0/24   | N     | director control plane | ControlPlane |
 | eth2      | 3704 | Y      | 192.168.12.0/22   | N     | tenant networks | Tenant |
 | eth2      | 3803 | Y      | 128.31.28.0/24    | N     | floating ip | |
+| eth3      | 3700 | Y      | 192.168.16.0/22   | N     | ceph public network | Storage |
 
 ## Wrapper scripts
 

diff --git a/templates/network/config/compute.yaml b/templates/network/config/compute.yaml
@@ -107,14 +107,14 @@ resources:
             # script mentioned in the preceding get_file directive.
             $network_config:
               network_config:
-              # eth0 is the foreman provisioning network
+              # eth2 is the foreman provisioning network
               - type: interface
-                name: eth0
+                name: eth2
                 use_dhcp: true
 
-              # Put storage on eth1
+              # Put storage on eth3
               - type: vlan
-                device: eth1
+                device: eth3
                 vlan_id:
                   get_param: StorageNetworkVlanID
                 use_dhcp: false

diff --git a/templates/network/config/controller.yaml b/templates/network/config/controller.yaml
@@ -107,15 +107,15 @@ resources:
             # script mentioned in the preceding get_file directive.
             $network_config:
               network_config:
-              # eth0 is the foreman provisioning network.
+              # eth2 is the foreman provisioning network.
               - type: interface
-                name: eth0
+                name: eth2
                 use_dhcp: true
                 defroute: false
 
-              # Put storage on eth1
+              # Put storage on eth3
               - type: vlan
-                device: eth1
+                device: eth3
                 vlan_id:
                   get_param: StorageNetworkVlanID
                 use_dhcp: false