Merge "Make kolla script bashate compliant"

This commit is contained in:
Jenkins 2015-06-08 15:50:04 +00:00 committed by Gerrit Code Review
commit e08b9d0010

View File

@ -47,15 +47,15 @@ function process_all {
} }
function check_selinux { function check_selinux {
# Check for SELinux in Enforcing mode and exit if found # Check for SELinux in Enforcing mode and exit if found
if [[ -x /usr/sbin/getenforce ]]; then if [[ -x /usr/sbin/getenforce ]]; then
if [[ $(/usr/sbin/getenforce) == "Enforcing" ]]; then if [[ $(/usr/sbin/getenforce) == "Enforcing" ]]; then
echo "You must execute this script without SELinux enforcing mode." echo "You must execute this script without SELinux enforcing mode."
echo "Turn off SELinux enforcing mode by running:" echo "Turn off SELinux enforcing mode by running:"
echo "$ sudo setenforce permissive" echo "$ sudo setenforce permissive"
exit 1 exit 1
fi fi
fi fi
} }
function pre_start { function pre_start {
@ -71,8 +71,7 @@ function pre_start {
} }
function post_start { function post_start {
until keystone user-list | grep glance until keystone user-list | grep glance; do
do
echo "Waiting for OpenStack services to become available" echo "Waiting for OpenStack services to become available"
sleep 2 sleep 2
done done