Merge "Revert "Allow test slaves to talk to themselves""

This commit is contained in:
Jenkins 2016-03-25 06:29:02 +00:00 committed by Gerrit Code Review
commit 33b4a0839c
2 changed files with 4 additions and 7 deletions

View File

@ -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.

View File

@ -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