Merge lp:~saviq/charms/trusty/neutron-contrail/config-vhost-interface into lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk

[Michał Sawicz]

Add fold-juju-bridge and optional vhost-interface config options to deal with more complex network configurations

[lp:~saviq/charms/trusty/neutron-contrail/config-vhost-interface]

45. By Michał Sawicz on 2015-06-29

Clarify the warning

46. By Michał Sawicz on 2015-06-30

Do not back up our own configs

47. By Michał Sawicz on 2015-06-30

Fix config var name

48. By Michał Sawicz on 2015-06-30

Change ifdown order, otherwise vif tries to delete interfaces that are already down

49. By Michał Sawicz on 2015-06-30

Fix vhost-phys.sh script

50. By Michał Sawicz on 2015-06-30

Take down vhost0, agent and toggle module before configuring vrouter

Otherwise `vif --add` has no effect and networking is gone

51. By Michał Sawicz on 2015-07-01

Merge trunk

52. By Michał Sawicz on 2015-07-01

Need to start the service in case the physical interface does not change

[Robert Ayres (robert-ayres)]

Merged with some reworkings.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-06-02 12:50:23 +0000
+++ config.yaml	2015-07-01 11:55:34 +0000
@@ -35,3 +35,17 @@
   discovery-server-ip:
     type: string
     description: Specify discovery server ip manually
+  vhost-interface:
+    type: string
+    description: |
+      Specify the interface to install vhost0 on. If left empty, vhost0 will
+      be installed on the default gateway interface.
+  fold-juju-bridge:
+    type: boolean
+    default: False
+    description: |
+      Juju on MAAS creates a juju-br0 bridge for deploying LXC and KVM
+      workloads. Enable this to remove this bridge if you want to install
+      vhost0 directly on the underlying interface. WARNING: this will
+      break current and future juju-deployed LXC or KVM workloads on all
+      machines where this is set to True.
 
=== modified file 'hooks/neutron_contrail_hooks.py'
--- hooks/neutron_contrail_hooks.py	2015-05-21 16:05:07 +0000
+++ hooks/neutron_contrail_hooks.py	2015-07-01 11:55:34 +0000
@@ -14,6 +14,8 @@
 
 from charmhelpers.core.host import (
     restart_on_change,
+    service_stop,
+    service_start,
     service_restart
 )
 
@@ -32,6 +34,7 @@
     ifdown,
     ifup,
     modprobe,
+    rmmod,
     provision_vrouter,
     units,
     unprovision_vrouter,
@@ -59,8 +62,17 @@
 
 @hooks.hook("config-changed")
 def config_changed():
+    # Need to take down vhost0, the agent and toggle the module
+    # in case we change physical interfaces, otherwise vif --add
+    # does not work
+    ifdown(["vhost0"])
+    service_stop("contrail-vrouter-agent")
+    rmmod("vrouter")
+    modprobe("vrouter")
+    configure_vrouter()
     configure_virtual_gateways()
     write_config()
+    service_start("contrail-vrouter-agent")
     if not units("contrail-discovery") and not units("control-node"):
         config["control-node-ready"] = True if config.get("discovery-server-ip") \
                                             else False
 
=== modified file 'hooks/neutron_contrail_utils.py'
--- hooks/neutron_contrail_utils.py	2015-06-30 18:42:39 +0000
+++ hooks/neutron_contrail_utils.py	2015-07-01 11:55:34 +0000
@@ -28,7 +28,12 @@
     return 8082
 
 def configure_vrouter():
-    check_call(["./create-vrouter.sh"], cwd="scripts")
+    args = ["./create-vrouter.sh"]
+    if config.get("fold-juju-bridge", False):
+        args.append("-j")
+    if config.get("vhost-interface", ""):
+        args.append(config["vhost-interface"])
+    check_call(args, cwd="scripts")
 
 def contrail_api_ctx():
     ip = config.get("contrail-api-ip")
@@ -117,6 +122,10 @@
             modules.write(module)
             modules.write("\n")
 
+def rmmod(module):
+    log("Unloading kernel module {}".format(module))
+    check_call(["rmmod", module])
+
 def neutron_metadata_ctx():
     ctxs = [ { "metadata_secret": relation_get("shared-secret", unit, rid) }
              for rid in relation_ids("neutron-metadata")
@@ -208,7 +217,7 @@
     return ip + "/" + str(cidr)
 
 def vhost_phys():
-    return check_output(["scripts/vhost-phys.sh"]).rstrip()
+    return check_output(["./vhost-phys.sh"], cwd="scripts").rstrip()
 
 def vrouter_ctx():
     return { "hostname": vrouter_hostname(),
 
=== added file 'scripts/br-interfaces.awk'
--- scripts/br-interfaces.awk	1970-01-01 00:00:00 +0000
+++ scripts/br-interfaces.awk	2015-07-01 11:55:34 +0000
@@ -0,0 +1,35 @@
+function strip(s)
+{
+    sub(/^[[:blank:]]+/, "", s)
+    sub(/[[:blank:]]+$/, "", s)
+    return s
+}
+
+/^[[:blank:]]*(iface|mapping|auto|allow-[^ ]+|source) / {
+    iface = 0
+}
+
+$0 ~ "^[[:blank:]]*(iface|auto) (" interface "|juju-br0)" {
+    if ($1 == "auto" && $2 == "juju-br0") {
+        print "auto", interface > interface_head
+    }
+    if ($1 == "iface") {
+        iface = 1
+        if ($2 == "juju-br0") {
+            print "iface", interface, $3, $4 > interface_head
+        }
+    }
+
+    print "#" $0
+    next
+}
+
+iface == 1 {
+    if (!match($0, "^[[:blank:]]*(bridge_|#|$)")) {
+        print "    " strip($0) > interface_cfg
+    }
+    print "#" $0
+    next
+}
+
+{ print $0 }
 
=== modified file 'scripts/create-vrouter.sh'
--- scripts/create-vrouter.sh	2014-12-03 16:51:47 +0000
+++ scripts/create-vrouter.sh	2015-07-01 11:55:34 +0000
@@ -1,5 +1,12 @@
 #!/bin/sh -e
 
+configJujuBr()
+{
+	cat juju-header
+	cat "$1"
+	cat "$2" 2> /dev/null || true
+}
+
 configVRouter()
 {
 	cat juju-header
@@ -39,43 +46,101 @@
 
 restoreIfaces()
 {
-	cat $TMP/$1.ifaces | xargs -n 1 brctl addif $1 || true
+	[ -e $TMP/$1.ifaces ] && cat $TMP/$1.ifaces | xargs -n 1 brctl addif $1 || true
 }
 
 saveIfaces()
 {
-	find /sys/class/net/$1/brif | tail -n +2 | xargs -n 1 basename \
-	    > $TMP/$1.ifaces
-}
-
+	find /sys/class/net/$1/brif | tail -n +2 | xargs -n 1 basename > $TMP/$1.ifaces
+}
+
+mangleConfigs()
+{
+	for cfg in /etc/network/interfaces /etc/network/interfaces.d/*.cfg \
+		/etc/network/*.config; do
+		[ -e "$cfg" ] || continue
+		awk $@ "$cfg" > $TMP/interfaces.cfg
+		if ! diff $TMP/interfaces.cfg "$cfg" > /dev/null; then
+			if [ "$cfg" != "$JUJUBR_CFG" -a "$cfg" != "$VROUTER_CFG" ]; then
+				[ -e "$cfg.save" ] || mv "$cfg" "$cfg.save"
+			fi
+			cat juju-header $TMP/interfaces.cfg > "$cfg"
+		fi
+	done
+}
+
+restoreConfigs()
+{
+	rm $JUJUBR_CFG $VROUTER_CFG 2> /dev/null || true
+	for file in `find /etc/network -name '*.save'`
+	do
+		mv "$file" "${file%.save}"
+	done
+}
+
+JUJUBR_CFG=/etc/network/interfaces.d/jujubr.cfg
+VROUTER_CFG=/etc/network/interfaces.d/vrouter.cfg
 TMP=$(mktemp -d /tmp/create-vrouter.XXX)
 
-if [ $# -ne 0 ]; then
-	interface=$1
-else
-	interface=$(route -n | awk '$1 == "0.0.0.0" { print $8 }')
-fi
-
-ifacedown $interface vhost0; sleep 5
+# determine base juju-br0 and vhost0 interfaces
+vhost_interface=$(grep -e "iface.*inet manual" $VROUTER_CFG | awk '{ print $2 }') 2> /dev/null || true
+br_interface=$(ls /sys/class/net/juju-br0/brif | head -n1) 2> /dev/null || true
+
+# restore original configs
+ifacedown juju-br0 $br_interface $vhost_interface; sleep 5
+restoreConfigs
+ifaceup $br_interface $vhost_interface juju-br0; sleep 5
+
+# determine restored juju-br0 interface
+br_interface=$(ls /sys/class/net/juju-br0/brif | head -n1) 2> /dev/null || true
+
+# ensure interfaces.d support
 if ! grep -q '^[[:blank:]]*source /etc/network/interfaces\.d/\*\.cfg[[:blank:]]*$' \
-    /etc/network/interfaces; then
+	/etc/network/interfaces; then
+	[ -e /etc/network/interfaces.save ] || cp /etc/network/interfaces /etc/network/interfaces.save
 	printf "\n%s\n" "source /etc/network/interfaces.d/*.cfg" \
-	    >> /etc/network/interfaces
+		>> /etc/network/interfaces
 fi
 mkdir -p /etc/network/interfaces.d
-for cfg in /etc/network/interfaces /etc/network/interfaces.d/*.cfg \
-    /etc/network/*.config; do
-	[ -e "$cfg" ] || continue
-	awk -v interface=$interface -v interface_cfg=$TMP/interface.cfg \
-	    -v vrouter_cfg=$TMP/vrouter.cfg -f vrouter-interfaces.awk "$cfg" \
-	    > $TMP/interfaces.cfg
-	if ! diff $TMP/interfaces.cfg "$cfg" > /dev/null; then
-		mv "$cfg" "$cfg.save"
-		cat juju-header $TMP/interfaces.cfg > "$cfg"
+
+# drop juju bridge
+if [ "$1" = "-j" ]; then
+	shift
+	if [ ! -e "/sys/class/net/juju-br0" ]; then
+		echo "WARNING: did not find juju-br0, ignoring \"-j\""
+	else
+		ifacedown juju-br0 $br_interface
+		mangleConfigs -v interface=$br_interface -v interface_cfg=$TMP/interface.cfg \
+			      -v interface_head=$TMP/interface.head -f br-interfaces.awk
+		configJujuBr $TMP/interface.head $TMP/interface.cfg \
+			> $JUJUBR_CFG
+		ifaceup $br_interface
 	fi
-done
-configVRouter $interface $TMP/interface.cfg $TMP/vrouter.cfg \
-    > /etc/network/interfaces.d/vrouter.cfg
-ifaceup $interface vhost0
-
+	rm -f $TMP/*
+fi
+
+# determine/validate vhost interface
+if [ -n "$1" ]; then
+	interface=$1
+else
+	interface=$(route -n | awk '$1 == "0.0.0.0" { print $8 }')
+fi
+
+if [ -z "$interface" -o ! -e "/sys/class/net/$interface" ]; then
+	echo "WARNING: invalid interface for vhost0: \"$interface\"," >&2
+	echo "skipping vhost0 configuration" >&2
+	interface=""
+fi
+
+# configure vhost0
+if [ -n "$interface" ]; then
+	ifacedown vhost0 $interface $vhost_interface; sleep 5
+	mangleConfigs -v interface=$interface -v interface_cfg=$TMP/interface.cfg \
+		      -v vrouter_cfg=$TMP/vrouter.cfg -f vrouter-interfaces.awk
+
+	configVRouter $interface $TMP/interface.cfg $TMP/vrouter.cfg \
+		> $VROUTER_CFG
+	ifaceup $interface $vhost_interface vhost0
+	rm -f $TMP/*
+fi
 rm -rf $TMP
 
=== added file 'scripts/vhost-phys.awk'
--- scripts/vhost-phys.awk	1970-01-01 00:00:00 +0000
+++ scripts/vhost-phys.awk	2015-07-01 11:55:34 +0000
@@ -0,0 +1,12 @@
+/^vif/ {
+    if ($3 != "vhost0") {
+        iface = $3
+    }
+    next
+}
+
+$2 == "HWaddr:" mac {
+    print iface
+    exit
+}
+
 
=== modified file 'scripts/vhost-phys.sh'
--- scripts/vhost-phys.sh	2014-10-31 18:30:28 +0000
+++ scripts/vhost-phys.sh	2015-07-01 11:55:34 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
 mac=$(cat /sys/class/net/vhost0/address)
-vif --list | awk -v mac=$mac 'BEGIN { RS="\n\n" }; $3 != "vhost0" && $5 == "HWaddr:" mac { print $3; exit 0 }'
+vif --list | awk -v mac=$mac -f vhost-phys.awk