Upgrade to Fedora 21, Docker 1.6, clean-up SDN

cluster/vagrant/provision-minion.sh

@@ -17,11 +17,25 @@
 # exit on any error
 set -e
 
+# Set the host name explicitly
+# See: https://github.com/mitchellh/vagrant/issues/2430
+hostnamectl set-hostname ${MINION_NAME}
+
+# Workaround to vagrant inability to guess interface naming sequence
+# Tell system to abandon the new naming scheme and use eth* instead
+rm -f /etc/sysconfig/network-scripts/ifcfg-enp0s3
+
+# Disable network interface being managed by Network Manager (needed for Fedora 21+)
+NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
+sed -i 's/^NM_CONTROLLED=no/#NM_CONTROLLED=no/' ${NETWORK_CONF_PATH}ifcfg-eth1
+systemctl restart network
+
 # Setup hosts file to support ping by hostname to master
 if [ ! "$(cat /etc/hosts | grep $MASTER_NAME)" ]; then
   echo "Adding $MASTER_NAME to hosts file"
   echo "$MASTER_IP $MASTER_NAME" >> /etc/hosts
 fi
+echo "$MINION_IP $MINION_NAME" >> /etc/hosts
 
 # Setup hosts file to support ping by hostname to each minion in the cluster
 for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
@@ -33,6 +47,12 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
   fi
 done
 
+# Configure network
+provision-network
+
+# Placeholder for any other manifests that may be per-node.
+mkdir -p /etc/kubernetes/manifests
+
 # Let the minion know who its master is
 # Recover the salt-minion if the salt-master network changes
 ## auth_timeout - how long we want to wait for a time out
@@ -73,6 +93,7 @@ grains:
     - kubernetes-pool
   cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
   hostname_override: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
+  docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'
 EOF
 
 # we will run provision to update code each time we test, so we do not want to do salt install each time