diff options
| -rwxr-xr-x | tools/setup_RedHat.sh | 2 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh index ce5a93838..a062768b8 100755 --- a/tools/setup_RedHat.sh +++ b/tools/setup_RedHat.sh @@ -31,7 +31,7 @@ function setup_disk { # (SamYaple)TODO: Remove the path overriding export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -cat | sudo tee /etc/yum.repos.d/docker.repo << EOF +sudo tee /etc/yum.repos.d/docker.repo << EOF [docker] name=Docker Main Repository baseurl=https://yum.dockerproject.org/repo/main/centos/7 diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index dbfcd3d64..e7c75425d 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 |