Merge "Zuulv3 iptables"

tests/bin/fix_gate_iptables.sh

@@ -1,5 +1,11 @@
 #!/bin/bash -xe
 
+#FIXME(kfox1111) just turn off iptables for now... It is getting in the way in zuulv3 and
+#we dont have time to debug the exact changes to the infra. Reenable it properly in a
+#follow on PS.
+sudo iptables -F
+exit
+
 l=$(sudo iptables -L INPUT --line-numbers | grep openstack-INPUT | \
     awk '{print $1}')
 sudo iptables -D INPUT $l

tools/setup_gate_ceph.sh

@@ -67,7 +67,7 @@ if [ "x$CONFIG" == "xceph-multi" ]; then
            ssh -n $line sudo yum remove -y iscsi-initiator-utils
         fi
         ssh -n $line sudo mv kubectl /usr/bin/
-        ssh -n $line bash setup_kubernetes.sh slave "$(cat /etc/kubernetes/token.txt)" "$(cat /etc/kubernetes/ip.txt)"
+        ssh -n $line bash setup_kubernetes.sh slave "$(cat /etc/kubernetes/token.txt)" "$(cat /etc/kubernetes/ip.txt)" "$(cat /etc/kubernetes/cahash.txt)"
         set +xe
         count=0
         while true; do

tools/setup_kubernetes.sh

@@ -45,11 +45,12 @@ kubeadm init --skip-preflight-checks --service-cidr 172.16.128.0/24 --pod-networ
              --apiserver-advertise-address $(cat /etc/nodepool/primary_node_private) | tee /tmp/kubeout
 grep 'kubeadm join --token' /tmp/kubeout | awk '{print $4}' > /etc/kubernetes/token.txt
 grep 'kubeadm join --token' /tmp/kubeout | awk '{print $5}' > /etc/kubernetes/ip.txt
+grep 'kubeadm join --token' /tmp/kubeout | awk '{print $7}' > /etc/kubernetes/cahash.txt
 rm -f /tmp/kubeout
 EOF
 else
     cat >> /tmp/setup.$$ <<EOF
-kubeadm join --token "$2" "$3" --skip-preflight-checks
+kubeadm join --token "$2" "$3" --skip-preflight-checks --discovery-token-ca-cert-hash "$4"
 EOF
 fi
 cat >> /tmp/setup.$$ <<"EOF"