Merge "gate: fix ceph on centos"

This commit is contained in:
Zuul 2018-03-23 01:44:02 +00:00 committed by Gerrit Code Review
commit f2300e9e68
2 changed files with 3 additions and 1 deletions

View File

@ -30,6 +30,9 @@ if [ "x${ID}" == "xubuntu" ] && \
else
CRUSH_TUNABLES=null
fi
if [ "x${ID}" == "xcentos" ]; then
CRUSH_TUNABLES=hammer
fi
tee /tmp/ceph.yaml << EOF
endpoints:
identity:

View File

@ -21,7 +21,6 @@ helm upgrade --install mariadb ./mariadb \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_MARIADB}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack