Merge branch 'master' into lowercase2

.versionfile

@@ -1 +1 @@
-0.1.42
+0.1.43

clusterctl/examples/ssh/bootstrap_scripts/centos-7.4/sds/common_functions.template

@@ -6,7 +6,9 @@
 
             dockerRpms=$(rpm -qa 'docker*')
             if [[ -z "${dockerRpms// }" ]];then
-              if ! yum install docker -y;then
+              # https://github.com/openshift/origin/issues/21609
+              # https://bugzilla.redhat.com/show_bug.cgi?id=1655975
+              if ! yum install docker-1.13.1-75.git8633870.el7.centos -y;then
                 echo >&2 "Unable to install docker"
                 return 1
               fi
@@ -215,8 +217,9 @@
               return 1
             fi
 
-            echo -e '\n127.0.0.1   registry-1.docker.io gcr.io k8s.gcr.io quay.io\n' >> /etc/hosts
-            echo -e '\n182.193.17.192   sds.redii.net\n' >> /etc/hosts
+            echo "$(ifconfig ens192 | grep -Po 'inet (\d{1,3}\.?)+' | awk '{print $2}') $(hostname)" >> /etc/hosts
+            echo "127.0.0.1 registry-1.docker.io gcr.io k8s.gcr.io quay.io" >> /etc/hosts
+            echo -e "182.193.17.192 sds.redii.net\n" >> /etc/hosts
           }
 
           install_k8s_w_yum()
@@ -289,17 +292,27 @@
             fi
 
             yum install -y conntrack
+            modprobe br_netfilter
 
             if ! swapoff -a;then
               echo >&2 "Unable to turn off swapping"
               return 1
             fi
 
+            # make sure swap is off after reboots
+            if grep -Pq '^/dev/mapper/centos-swap' /etc/fstab; then
+              sed -ri.bak-$(date +%Y%m%dT%H%M%S) 's/(.*centos-swap.*)/#\1/' /etc/fstab
+            fi
+
             cat <<EOF >  /etc/sysctl.d/k8s.conf
           net.bridge.bridge-nf-call-ip6tables = 1
           net.bridge.bridge-nf-call-iptables = 1
           EOF
 
+            # stop and disable firewall
+            systemctl stop firewalld
+            systemctl disable firewalld
+
             if ! sysctl --system;then
               echo >&2 "Unable to set net.bridge.bridge-nf-call-iptables sysctl settings"
               return 1