openstack/kolla-ansible
Code Issues Proposed changes

Fix the rabbitmq crash on CentOS binary and source deploy

Browse Source 
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

Partial-Bug: #1581301
Change-Id: Ia692794aadf11d3ebe75e4e2bf6b42d9a5f3996f
This commit is contained in:
Jeffrey Zhang 2016-05-19 09:57:56 +08:00
parent 3f2a5bdadc
commit c98e9c44f2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/setup_RedHat.sh
View File

@ -31,7 +31,7 @@ function setup_disk {
# (SamYaple)TODO: Remove the path overriding # (SamYaple)TODO: Remove the path overriding
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" 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] [docker]
name=Docker Main Repository name=Docker Main Repository
baseurl=https://yum.dockerproject.org/repo/main/centos/7 baseurl=https://yum.dockerproject.org/repo/main/centos/7

15
tools/setup_gate.sh
View File

@ -76,17 +76,16 @@ function setup_ssh {
function setup_inventory { function setup_inventory {
local counter=0 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 echo -e "127.0.0.1\tlocalhost" > /tmp/hosts
for ip in $(cat /etc/nodepool/{node_private,sub_nodes_private}); do for ip in $(cat /etc/nodepool/{node_private,sub_nodes_private}); do
: $((counter++)) : $((counter++))
echo -e "${ip}\tnode${counter} $(ssh ${ip} hostname)" >> /tmp/hosts # FIXME(jeffrey4l): do not set two hostnames in oneline. this is a
echo "node${counter} ansible_connection=${ANSIBLE_CONNECTION_TYPE}" >> ${RAW_INVENTORY} # 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 done
sudo chown root: /tmp/hosts sudo chown root: /tmp/hosts