Merge branch 'master' into develop

Bump version to 0.18.1next
Conflicts:
	docs/version.py
	version
	version.m4

Author: skalkoto

ChangeLog

@@ -1,3 +1,6 @@
+2015-03-13, v0.18.1
+	* HELPER: Fix a bug in ConfigureNetwork task that caused a syntax error
+	  if the SUBNET was missing for a NIC
 2015-03-03, v0.18
 	* HELPER: Auto-detect OSFAMILY and ROOT_PARTITION properties if missing
 	* HELPER: Add new CofigureNetwork image configuration task

docs/version.py

@@ -1 +1 @@
-__version__ = "0.18next"
+__version__ = "0.18.1next"

snf-image-helper/networking/freebsd.sh.in

@@ -72,7 +72,8 @@ grep -v "ifconfig_$driver$index" "$CONF" > "$tmp_config"
 cat "$tmp_config" > "$CONF"
 
 if [ "$ipv4" = 'static' ]; then
-    echo "ifconfig_$driver$index=\"inet $IP netmask $(cidr2mask "${SUBNET##*/}")\"" >> "$CONF"
+    netmask=$(cidr2mask "${SUBNET##*/}")
+    echo "ifconfig_$driver$index=\"inet $IP netmask $netmask\"" >> "$CONF"
     if [ -n "$GATEWAY" ]; then
         sed -i '/^defaultrouter=/d' "$CONF"
         echo "defaultrouter=\"$GATEWAY\"" >> "$CONF"

snf-image-helper/networking/netbsd.sh.in

@@ -73,7 +73,8 @@ if [ "$ipv4" != none -o "$ipv6" != none ]; then
 fi
 
 if [ "$ipv4" = 'static' ]; then
-    echo "inet $IP netmask $(cidr2mask "${SUBNET##*/}")" >> "$IFCONFIG"
+    netmask=$(cidr2mask "${SUBNET##*/}")
+    echo "inet $IP netmask $netmask" >> "$IFCONFIG"
     if [ -n "$GATEWAY" ]; then
         sed -i '/^defaultroute=/d' "$RC_CONF"
         echo "defaultroute=$GATEWAY" >> "$RC_CONF"

snf-image-helper/networking/openbsd.sh.in

@@ -69,7 +69,8 @@ SYSCTL="$SNF_IMAGE_TARGET/etc/sysctl.conf"
 cat /dev/null > "$HOSTNAME"
 
 if [ "$ipv4" = 'static' ]; then
-    echo "inet $IP $(cidr2mask "${SUBNET##*/}") NONE" >> "$HOSTNAME"
+    netmask=$(cidr2mask "${SUBNET##*/}")
+    echo "inet $IP $netmask NONE" >> "$HOSTNAME"
     if [ -n "$GATEWAY" ]; then
         echo "$GATEWAY" > "$MYGATE"
     fi

snf-image-helper/networking/redhat.sh.in

@@ -70,7 +70,8 @@ echo -e "DEVICE=eth${index}\nONBOOT=yes\nHWADDR=$MAC" > "$IFCFG"
 echo "NM_CONTROLLED=yes" >> "$IFCFG"
 
 if [ "$ipv4" = 'static' ]; then
-    echo -e "BOOTPROTO=static\nIPADDR=$IP\nNETMASK=$(cidr2mask "${SUBNET##*/}")" >> "$IFCFG"
+    netmask=$(cidr2mask "${SUBNET##*/}")
+    echo -e "BOOTPROTO=static\nIPADDR=$IP\nNETMASK=$netmask" >> "$IFCFG"
 elif [ "$ipv4" = 'dhcp' ]; then
     echo -e "BOOTPROTO=dhcp" >> "$IFCFG"
 else

snf-image-helper/tasks/50ConfigureNetwork.in

@@ -92,6 +92,11 @@ for index in $(seq 0 $((NIC_COUNT-1))); do
         done
     done
 
+    # If the subnet is missing, the card cannot be configure in a static way
+    if [ -z "${SUBNET}" ]; then
+        dhcp=yes
+    fi
+
     if [ -n "${IP}" ]; then
         ipv4=yes
     fi

version

@@ -1 +1 @@
-0.18next
+0.18.1next

version.m4

@@ -1 +1 @@
-m4_define([devflow_version], [0.18next])
+m4_define([devflow_version], [0.18.1next])