From e88dd66c8a8abdf5d31c9a03c374da8785e459ec Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 24 Mar 2016 17:11:24 -0700 Subject: [PATCH] Revert "Allow test slaves to talk to themselves" This reverts commit 468f17c4f6afac507dba9d4783c7da6fde24f656. This isn't working on fedora-23 or centos7 slaves for some reason making it very difficult to get those nodes ready. Revert in order to do more testing across the platforms. Change-Id: I634e784b71a2d92a745f8d9c89532e953f48b9cf --- nodepool/scripts/configure_mirror.sh | 7 ------- nodepool/scripts/multinode_setup.sh | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh index 004d6d99f0..2c22bba814 100755 --- a/nodepool/scripts/configure_mirror.sh +++ b/nodepool/scripts/configure_mirror.sh @@ -16,13 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Ensure that we can talk to ourselves over any of our known IPs -# and that our related nodes can talk to use from all of their -# known IPs -for ip in $(cat /etc/nodepool/primary_node /etc/nodepool/sub_nodes /etc/nodepool/primary_node_private /etc/nodepool/sub_nodes_private | sort -u); do - sudo iptables -I openstack-INPUT 1 -s $ip -j ACCEPT -done - source /etc/nodepool/provider # Generate the AFS Slug from the host system. diff --git a/nodepool/scripts/multinode_setup.sh b/nodepool/scripts/multinode_setup.sh index e0d654ce7b..704351140a 100755 --- a/nodepool/scripts/multinode_setup.sh +++ b/nodepool/scripts/multinode_setup.sh @@ -18,6 +18,10 @@ export PATH=$PATH:/usr/local/sbin:/usr/sbin +for ip in $(cat /etc/nodepool/primary_node /etc/nodepool/sub_nodes /etc/nodepool/primary_node_private /etc/nodepool/sub_nodes_private | sort -u); do + sudo iptables -I openstack-INPUT 1 -s $ip -j ACCEPT +done + echo "" >> /home/jenkins/.ssh/authorized_keys cat /etc/nodepool/id_rsa.pub >> /home/jenkins/.ssh/authorized_keys echo "" >> /home/jenkins/.ssh/authorized_keys