openstack
/
kolla
Code Issues Proposed changes

Workaround broken nodepool to unblock gate 

Sed and check the length of the IP addresses in the private list.
If none found, copy the public to the private.

Change-Id: I05e4798aa301e022de7d5097d503d8213f2b66a8
Closes-Bug: #1571275
(cherry picked from commit f442319b19)
This commit is contained in:
Steven Dake 2016-04-19 16:34:35 -07:00
parent a2cef8db42
commit c93e528974
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/setup_gate.sh
View File

@ -54,6 +54,16 @@ function detect_distro {
DISTRO=$(ansible all -i "localhost," -msetup -clocal | awk -F\" '/ansible_os_family/ {print $4}')
}
# NOTE(sdake): This works around broken nodepool on systems with only one
# private interface
# The big regex checks for IP addresses in the file
function setup_workaround_broken_nodepool {
if [[ `grep -E -o "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" /etc/nodepool/node_private | wc -l` -eq 0 ]]; then
cp /etc/nodepool/node /etc/nodepool/node_private
cp /etc/nodepool/sub_nodes /etc/nodepool/sub_nodes_private
fi
}
function setup_ssh {
# Generate a new keypair that Ansible will use
ssh-keygen -f /home/jenkins/.ssh/kolla -N ''
@ -122,6 +132,7 @@ function setup_logging {
setup_logging
tools/dump_info.sh
setup_workaround_broken_nodepool
setup_ssh
setup_ansible
setup_node