From fe99cd6fa16a9b2967d5b374ae45859de47056eb Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Thu, 16 Jul 2015 14:57:23 -0400 Subject: [PATCH 1/3] restart network twice to workaround bug --- cluster/vagrant/provision-master.sh | 3 +++ cluster/vagrant/provision-minion.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index 720cbe2af96..c9c3a3359e7 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -28,6 +28,9 @@ 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 +sleep 5 systemctl restart network function release_not_found() { diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh index 7d68701d635..9f17123feba 100755 --- a/cluster/vagrant/provision-minion.sh +++ b/cluster/vagrant/provision-minion.sh @@ -79,6 +79,9 @@ 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 +sleep 5 systemctl restart network # Setup hosts file to support ping by hostname to master From 09116b648082e141f6dee8b9694ce9465d57686d Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Thu, 16 Jul 2015 18:05:08 -0400 Subject: [PATCH 2/3] properly make sure that eth1 is not managed by NetworkManager --- cluster/vagrant/provision-master.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index c9c3a3359e7..962f1c28c49 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -27,10 +27,8 @@ 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 -sleep 5 +grep -q ^NM_CONTROLLED= ${NETWORK_CONF_PATH}ifcfg-eth1 || echo 'NM_CONTROLLED=no' >> ${NETWORK_CONF_PATH}ifcfg-eth1 +sed -i 's/^#NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${NETWORK_CONF_PATH}ifcfg-eth1 systemctl restart network function release_not_found() { From 6cf78c74289cfe24c0254823d44221c5c7b15760 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Thu, 16 Jul 2015 18:12:41 -0400 Subject: [PATCH 3/3] same change for minion provision script --- cluster/vagrant/provision-minion.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh index 9f17123feba..64d806ade26 100755 --- a/cluster/vagrant/provision-minion.sh +++ b/cluster/vagrant/provision-minion.sh @@ -78,10 +78,8 @@ 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 -sleep 5 +grep -q ^NM_CONTROLLED= ${NETWORK_CONF_PATH}ifcfg-eth1 || echo 'NM_CONTROLLED=no' >> ${NETWORK_CONF_PATH}ifcfg-eth1 +sed -i 's/^#NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${NETWORK_CONF_PATH}ifcfg-eth1 systemctl restart network # Setup hosts file to support ping by hostname to master