slapos-node: add loop until slapos webrunner is installed

f9264415 · Jondy Zhao · 3a7bd752 · f9264415
Commit f9264415 authored Jul 19, 2013 by Jondy Zhao
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 16 deletions

windows/scripts/slapos-include.sh windows/scripts/slapos-include.sh +13 -16

No files found.
--- a/windows/scripts/slapos-include.sh
+++ b/windows/scripts/slapos-include.sh
@@ -413,12 +413,13 @@ function create_slapos_webrunner_instance()
            sed -e "s/^.*, CN=//g" | sed -e "s%/emailAddress.*\$%%g")
        [[ "${_guid}" == COMP-+([0-9]) ]] ||
        csih_error "Invalid computer id '${_guid}' specified."
+        echo Got computer guid: ${_guid}

        _title="SlapOS-Node-Runner-In-${_guid}"
        if [[ -r $re6stnet_configure_file ]] ; then
            _re6stnet_ipv6=$(grep "Your subnet" $re6stnet_configure_file| \
                sed -e "s/^.*subnet: //g" -e "s/\/80 (CN.*\$/1/g")
-            if [[ ! -z "${_re6stnet_ipv6}" ]] ; then
+            if [[ -n "${_re6stnet_ipv6}" ]] ; then
                echo "Re6stnet address in this computer: ${_re6stnet_ipv6}"
                netsh interface ipv6 show addr $slapos_ifname level=normal | \
                    grep -q ${_re6stnet_ipv6} || \
@@ -446,10 +447,7 @@ function create_slapos_webrunner_instance()
            fi
            /opt/slapos/bin/slapos node instance --verbose
            /opt/slapos/bin/slapos node report --verbose
-            /opt/slapos/bin/slapos request $client_config_file ${_title} \
-                slaposwebrunner --node computer_guid=${_guid} && break
-            sleep 3
-        done
+
            # Connection parameters of instance are:
            #  {'backend_url': 'http://[2001:67c:1254:45::c5d5]:50000',
            #  'cloud9-url': 'http://localhost:9999',
@@ -459,9 +457,8 @@ function create_slapos_webrunner_instance()
            _url=$(/opt/slapos/bin/slapos request $client_config_file \
                ${_title} slaposwebrunner --node computer_guid=${_guid} | \
                grep backend_url | sed -e "s/^.*': '//g" -e "s/',.*$//g")            
-        echo "SlapOS Web Runner URL: ${_url}"
-        [[ -z "${_url}" ]] && \
-            csih_error "Failed to create instance of SlapOS Web Runner."
+            [[ -n "${_url}" ]] && echo "SlapOS Web Runner URL: ${_url}" && break
+        done

        cat <<EOF > $slaprunner_startup_file
 <html>