diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-23 12:59:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-23 12:59:18 +0000 |
| commit | 072cec2fbe6cd133f29703af7d28a3b77a17970d (patch) | |
| tree | 8bdb13ceca8ba8e79cc664a503f419f40750a83b /tools/setup_gate.sh | |
| parent | 931158b50f224c12f8c6aa29a7b79b72bee2f6af (diff) | |
| parent | c98e9c44f23d14867e4dddea88fe9a9f7aa50dd6 (diff) | |
| download | kolla-072cec2fbe6cd133f29703af7d28a3b77a17970d.tar.gz kolla-072cec2fbe6cd133f29703af7d28a3b77a17970d.zip | |
Merge "Fix the rabbitmq crash on CentOS binary and source deploy"
Diffstat (limited to 'tools/setup_gate.sh')
| -rwxr-xr-x | tools/setup_gate.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index d8b4d7067..31391b0ff 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -76,17 +76,16 @@ function setup_ssh { function setup_inventory { local counter=0 - if [[ "${DISTRO}" == "Debian" ]]; then - ANSIBLE_CONNECTION_TYPE=ssh - else - ANSIBLE_CONNECTION_TYPE=local - fi - echo -e "127.0.0.1\tlocalhost" > /tmp/hosts for ip in $(cat /etc/nodepool/{node_private,sub_nodes_private}); do : $((counter++)) - echo -e "${ip}\tnode${counter} $(ssh ${ip} hostname)" >> /tmp/hosts - echo "node${counter} ansible_connection=${ANSIBLE_CONNECTION_TYPE}" >> ${RAW_INVENTORY} + # FIXME(jeffrey4l): do not set two hostnames in oneline. this is a + # wordround fix for the rabbitmq failed when deploy on CentOS in the CI + # gate. the ideal fix should set the hostname in setup_gate.sh script. + # But it do not work as expect with unknown reason + echo -e "${ip}\tnode${counter}" >> /tmp/hosts + echo -e "${ip}\t$(ssh ${ip} hostname)" >> /tmp/hosts + echo "node${counter}" >> ${RAW_INVENTORY} done sudo chown root: /tmp/hosts |