openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make kolla script bashate compliant"

Browse Source
This commit is contained in:
Jenkins 2015-06-08 15:50:04 +00:00 committed by Gerrit Code Review
commit e08b9d0010
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/kolla
View File

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