diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-28 08:30:59 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-06-07 12:17:59 -0700 |
| commit | 70b8f4064e26376eac2582e5042196a8d102856b (patch) | |
| tree | 60a5423e6cab2ae01266d8c4ab011989538d7586 | |
| parent | f70ccabe529ceba459c2117357ae1a2851f9ac00 (diff) | |
| download | kolla-70b8f4064e26376eac2582e5042196a8d102856b.tar.gz kolla-70b8f4064e26376eac2582e5042196a8d102856b.zip | |
Make kolla script bashate compliant
Change-Id: Id02a4d20b9122d173f8ab56628cd055b4a5acf92
| -rwxr-xr-x | tools/kolla | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/kolla b/tools/kolla index c7be4b141..9590e60b4 100755 --- a/tools/kolla +++ b/tools/kolla @@ -43,15 +43,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 { @@ -67,8 +67,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 |
