diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-20 13:42:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-20 13:42:38 +0000 |
| commit | 3bb62d9d5afbbb2f955435bd51dd300a5170f8d5 (patch) | |
| tree | aea62f97be2f6c4080b9b24fd1a010adeed79c8c | |
| parent | 35e9ef860fadb71a3015e1e23a265f5ac1354605 (diff) | |
| parent | f442319b19b641d5ad45816dfea5db234f21e93c (diff) | |
| download | kolla-3bb62d9d5afbbb2f955435bd51dd300a5170f8d5.tar.gz kolla-3bb62d9d5afbbb2f955435bd51dd300a5170f8d5.zip | |
Merge "Workaround broken nodepool to unblock gate"
| -rwxr-xr-x | tools/setup_gate.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index c81f5bcf4..bed787875 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -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 |