Changeset 38594 for gs3-extensions

Timestamp:

2024-01-22T14:15:10+13:00 (5 months ago)

Author:

davidb

Message:

Next round of changes to streamline things further

Location:

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

Files:

• _local_config.bash (added)
• create-vm-with-static-ip-example.sh (modified) (4 diffs)
• ssh-login.sh (modified) (1 diff)

gs3-extensions/selfcontained-gcloud/trunk/spin-up-gce-vm/create-vm-with-static-ip-example.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# Edit the following to the name of the VM you want to create
-export GSVM_INSTANCE=greenstone3-debian-ansible-test
+. ./_local_config.bash
 
-gsvm_instance_disk=$GSVM_INSTANCE-disk
-gsvm_instance_nic=$GSVM_INSTANCE-nic
-
-gsvm_project=atea-storage
-gsvm_subproject=bluff
-gsvm_region=australia-southeast1
-gsvm_zone=australia-southeast1-b
-
-if [ ! -f $gsvm_project--$gsvm_subproject ] ; then
+if [ ! -f $gsvm_project--$gsvm_subproj ] ; then
     echo ""
     echo "----"
     echo "- Generating RSA key-pair for ssh access"
     echo "- [Press enter twice to set with an empty passphrase]"
-    ssh-keygen -t rsa -f $gsvm_project--$gsvm_subproject -C $gsvm_project--$gsvm_subproject
+    ssh-keygen -t rsa -f $gsvm_project--$gsvm_subproj -C $gsvm_project--$gsvm_subproj
     echo "----"
     echo ""
@@ -25 +16 @@
 #ssh_rsa_pubkey=$(cat $gsvm_project--$gsvm_subproject.pub | sed 's/ [a-z-]\+$//i')
 
-ssh_rsa_pubkey=$(cat $gsvm_project--$gsvm_subproject.pub | awk '{ print $2 }')
+ssh_rsa_pubkey=$(cat $gsvm_project--$gsvm_subproj.pub | awk '{ print $2 }')
 #ssh_rsa_esc_pubkey=$(echo $ssh_rsa_pubkey | sed 's/+/\\+/g')
 
@@ -40 +31 @@
 echo " than the default 10GB]"
 
+#--metadata="^%^ssh-keys=ateaspace:ssh-rsa $ssh_rsa_pubkey google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2024-02-21T02:40:49+0000\"}" \
+      
           
 gcloud compute instances create $GSVM_INSTANCE \
@@ -46 +39 @@
     --machine-type=e2-medium \
     --network-interface=network-tier=STANDARD,stack-type=IPV4_ONLY,subnet=default,no-address \
-    --metadata="^%^ssh-keys=ateaspace:ssh-rsa $ssh_rsa_pubkey google-ssh {\"userName\":\"ateaspace@gmail.com\",\"expireOn\":\"2024-02-21T02:40:49+0000\"}" \
+    --metadata="^%^ssh-keys=$GSVM_USER:ssh-rsa $ssh_rsa_pubkey ssh-$gsvm_project--$gsvm_subproj {\"userName\":\"$GSVM_USER@gmail.com\",\"expireOn\":\"2024-02-21T02:40:49+0000\"}" \
     --maintenance-policy=MIGRATE \
     --provisioning-model=STANDARD \

gs3-extensions/selfcontained-gcloud/trunk/spin-up-gce-vm/ssh-login.sh

@@ -1 @@
-ssh -i atea-storage--bluff [email protected]
+#!/bin/bash
+
+. ./_local_config.bash
+
+#ssh -i atea-storage--bluff [email protected]
+
+ssh -i $gsvm_project--$gsvm_subproj [email protected]