Change the order of context.sh retrieval methods

9 years ago · b5e1d71590
parent a39784fca5
commit b5e1d71590
1 changed files with 3 additions and 3 deletions
--- a/base/usr/sbin/one-contextd
+++ b/base/usr/sbin/one-contextd
@ -48,14 +48,14 @@ function start {
        execute_scripts

        umount /mnt
+    elif curl -o /tmp/context.sh http://169.254.169.254/latest/user-data ; then
+        export_rc_vars /tmp/context.sh
+        execute_scripts
    elif type vmtoolsd ; then
        vmtoolsd --cmd 'info-get guestinfo.opennebula.context' | \
            openssl base64 -d > /tmp/context.sh
        export_rc_vars /tmp/context.sh
        execute_scripts
-    elif curl -o /tmp/context.sh http://169.254.169.254/latest/user-data ; then
-        export_rc_vars /tmp/context.sh
-        execute_scripts
    fi
 }