From 72ea001161cc879d5ace7909b15e9970244b25a6 Mon Sep 17 00:00:00 2001 From: Beth Date: Sat, 29 Mar 2025 22:10:58 -0500 Subject: [PATCH] moved ansible build into if statement, fixed ansible if statement --- scripts/create.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/create.sh b/scripts/create.sh index 5c3d29c..16ec7ce 100644 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -170,10 +170,13 @@ ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "ansible-galaxy collecti ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "ansible-galaxy collection install community.crypto" ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "ansible-galaxy collection install ansible.posix" -# run ansible -ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "mkdir /ansible/; curl -k 'https://git.actcur.com/actcur-ansible/playbook-builder/raw/branch/$branch/build_ansible.sh' -H 'accept: application/raw' -o /ansible/build_ansible.sh;echo "$branch" > /ansible/branch;/bin/bash /ansible/build_ansible.sh" +# Set up ansible +ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "mkdir /ansible/; curl -k 'https://git.actcur.com/actcur-ansible/playbook-builder/raw/branch/$branch/build_ansible.sh' -H 'accept: application/raw' -o /ansible/build_ansible.sh;echo "$branch" > /ansible/branch" + +if [[ "$ansible" == "y" ]]; then + # Run ansible twice - some configurations don't take effect on first run (i.e. when they are dependent on other configurations) + ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "/bin/bash /ansible/build_ansible.sh" -if [[ "$deflate" == "y" ]]; then ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "/bin/bash /ansible/build_ansible.sh" fi