From 401f66c24fea3f04469453f759b6c2d40548ddf1 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Sun, 2 Feb 2025 13:06:28 -0500 Subject: [PATCH] fix: Update to MorphoCloud/MorphoCloudWorkflow@f9e9dda List of MorphoCloudWorkflow changes: ``` $ git shortlog 6625f0e..f9e9dda --no-merges Jean-Christophe Fillion-Robin (3): fix(noxfile): Fix extraction of exosphere version fix(cloud-config): Correct syntax errors in git clone and ansible-playbook commands fix(cloud-config): Fix checkout of exosphere version ``` See https://github.com/MorphoCloud/MorphoCloudWorkflow/compare/6625f0e...f9e9dda --- cloud-config | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/cloud-config b/cloud-config index c94daf4c..19445d7c 100644 --- a/cloud-config +++ b/cloud-config @@ -45,21 +45,22 @@ retry ansible-galaxy collection install community.general rm -rf /opt/instance-config-mgt -# retry git clone \\ -# --depth=1 \\ -# --branch="{instance-config-mgt-repo-checkout}" \\ -# "{instance-config-mgt-repo-url}" \\ +# retry git clone \ +# --depth=1 \ +# --branch="{instance-config-mgt-repo-checkout}" \ +# "{instance-config-mgt-repo-url}" \ # /opt/instance-config-mgt -exosphere_sha="61891a755ee0a4f9d15b586d60477814885656fc" # morpho-cloud-portal-2025.01.29-5f7a4c38 -retry git clone \\ - --checkout="$exosphere_sha" \\ - "https://github.com/MorphoCloud/exosphere.git" \\ +retry git clone \ + "https://github.com/MorphoCloud/exosphere.git" \ /opt/instance-config-mgt -ansible-playbook \\ - -i /opt/instance-config-mgt/ansible/hosts \\ - -e "{\\"guac_enabled\\":true,\\"gui_enabled\\":true,\\"ansible_python_interpreter\\":\\"/opt/ansible-venv/bin/python\\"}" \\ +exosphere_sha="61891a755ee0a4f9d15b586d60477814885656fc" # morpho-cloud-portal-2025.01.29-5f7a4c38 +(cd /opt/instance-config-mgt && git reset --hard $exosphere_sha) + +ansible-playbook \ + -i /opt/instance-config-mgt/ansible/hosts \ + -e "{\"guac_enabled\":true,\"gui_enabled\":true,\"ansible_python_interpreter\":\"/opt/ansible-venv/bin/python\"}" \ /opt/instance-config-mgt/ansible/playbook.yml ANSIBLE_RETURN_CODE=$? if [ $ANSIBLE_RETURN_CODE -eq 0 ]; then STATUS="complete"; else STATUS="error"; fi