Changeset 38606 for gs3-extensions

Timestamp:

2024-01-22T16:59:13+13:00 (5 months ago)

Author:

davidb

Message:

User GSVM_USER to control user the ansible playbooks run as

Location:

gs3-extensions/selfcontained-gcloud/trunk/spin-up-gce-vm

Files:

• get-and-run-gs3-playbooks.sh (modified) (1 diff)
• provision-vm-instance.sh (modified) (1 diff)

gs3-extensions/selfcontained-gcloud/trunk/spin-up-gce-vm/get-and-run-gs3-playbooks.sh

@@ -19 +19 @@
 
 cd gs3-ansible-playbooks/ \
-    && ./01-RUN-ANSIBLE-BASE-INSTALL.sh \
-    && ./02-RUN-ANSIBLE-REVPROXY.sh
+    && ./01-RUN-ANSIBLE-BASE-INSTALL.sh $GSVM_USER \
+    && ./02-RUN-ANSIBLE-REVPROXY.sh $GSVM_USER

gs3-extensions/selfcontained-gcloud/trunk/spin-up-gce-vm/provision-vm-instance.sh

@@ -4 +4 @@
 
 echo "Copying get-and-run-gs3-playbooks.sh to $GSVM_USER@$GSVM_FQDN"
-scp -i $gsvm_project--$gsvm_subproj get-and-run-gs3-playbooks.sh $GSVM_USER@$GSVM_FQDN:.
+echo "[Substituting \$GSVM_USER -> $GSVM_USER in script]"
+# scp -i $gsvm_project--$gsvm_subproj get-and-run-gs3-playbooks.sh $GSVM_USER@$GSVM_FQDN:.
+
+cat get-and-run-gs3-playbooks.sh | sed "s/\$GSVM_USER/$GSVM_USER/g" | ssh -i $gsvm_project--$gsvm_subproj $GSVM_USER@$GSVM_FQDN cat ">" get-and-run-gs3-playbooks.sh 
 
 if [ $? = 0 ] ; then 
     echo "Running get-and-run-gs3-playbooks.sh on $GSVM_USER@$GSVM_FQDN"
-    ssh -i $gsvm_project--$gsvm_subproj $GSVM_USER@$GSVM_FQDN ./get-and-run-gs3-playbooks.sh
+    ssh -i $gsvm_project--$gsvm_subproj $GSVM_USER@$GSVM_FQDN chmod a+x ./get-and-run-gs3-playbooks.sh \
+    && ssh -i $gsvm_project--$gsvm_subproj $GSVM_USER@$GSVM_FQDN ./get-and-run-gs3-playbooks.sh
 else
     echo "Failed to scp get-and-run-gs3-playbooks.sh to $GSVM_USER@$GSVM_FQDN:."