Merge "Fix the rabbitmq crash on CentOS binary and source deploy"
This commit is contained in:
commit
072cec2fbe
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user