openstack/project-config
Code Issues Proposed changes

Revert "Allow test slaves to talk to themselves"

Browse Source 
This reverts commit 468f17c4f6.

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
This commit is contained in:
Clark Boylan 2016-03-24 17:11:24 -07:00
parent 11ce74c8ed
commit e88dd66c8a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodepool/scripts/configure_mirror.sh
View File

@ -16,13 +16,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 source /etc/nodepool/provider
# Generate the AFS Slug from the host system. # Generate the AFS Slug from the host system.

4
nodepool/scripts/multinode_setup.sh
View File

@ -18,6 +18,10 @@
export PATH=$PATH:/usr/local/sbin:/usr/sbin 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 echo "" >> /home/jenkins/.ssh/authorized_keys
cat /etc/nodepool/id_rsa.pub >> /home/jenkins/.ssh/authorized_keys cat /etc/nodepool/id_rsa.pub >> /home/jenkins/.ssh/authorized_keys
echo "" >> /home/jenkins/.ssh/authorized_keys echo "" >> /home/jenkins/.ssh/authorized_keys