[baremetal] cmp: Add missing public gw (default)

When we dropped the default gw via mas01 NAT, we uncovered a bug,
compute nodes do not have the proper public gw set up and used
to reach public network via mas01, slowing everything down.
Add gw similar to prx nodes.

Fixes: d4ab072

Change-Id: I4343c31c376a7a223670cdd623366454396d8d92
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
new file mode 100644 (file)
index 0000000..c36631a
--- /dev/null
+++ b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
@@ -0,0 +1,32 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 31 Dec 2017 16:06:30 +0100
+Subject: [PATCH] network.interface: Fix ifup OVS port with route
+
+This change attempts to fix the following sequence for nodes with
+OVS ports that also have routes defined:
+- state.sls linux.network; system.reboot; state.sls linux.network;
+
+If an OVS port also has a route defined, a route cfg file is
+created in </etc/network/if.{down,up}.d/>, which is sourced after
+system reboot before we (eventually) re-run `interface.sls`, leaving
+the OVS port in UP state, so `ifup` would fail.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ linux/network/interface.sls | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/linux/network/interface.sls b/linux/network/interface.sls
+--- a/linux/network/interface.sls
++++ b/linux/network/interface.sls
+@@ -146,6 +146,10 @@ ovs_port_up_{{ interface_name }}:
+     - file: ovs_port_{{ interface_name }}_line2
+     - openvswitch_bridge: ovs_bridge_{{ interface.bridge }}
+     - file: linux_interfaces_final_include
++  {%- if interface.route is defined %}
++  - unless:
++    - ip link show {{ interface_name }} | grep -q '\<UP\>'
++  {% endif %}
+
+ {%- endif %}
+

diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index cd32378..cc17666 100644 (file)
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -11,6 +11,7 @@
 /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch
 /usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch
 /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
+/usr/share/salt-formulas/env: 0007-network.interface-Fix-ifup-OVS-port-with-route.patch
 /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
index 43ce8f9..bf2b66e 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
@@ -100,6 +100,11 @@ parameters:
           {%- endif %}
           address: ${_param:external_address}
           netmask: 255.255.255.0
+          route:
+            public:
+              address: 0.0.0.0
+              netmask: 0.0.0.0
+              gateway: ${_param:opnfv_net_public_gw}
         {{ nic_public }}:
           enabled: true
           proto: manual