adapt scripts to the new CLI

ansible-postgres/create_vms.sh

@@ -7,10 +7,10 @@ export FORMAT=YAML
 mkdir -p tmp
 
 detee-cli vm deploy --location US --hostname postgres-writer --public-ip \
-  --distro ubuntu --memory 2000 --vcpus 2 --disk 15 > tmp/writer.yaml &&
+  --distro ubuntu --memory 2 --vcpus 2 --disk 15 > tmp/writer.yaml &&
   echo "Postgres writer created in the US" &
 detee-cli vm deploy --location Canada --hostname postgres-reader --public-ip \
-  --distro ubuntu --memory 2000 --vcpus 2 --disk 15 > tmp/reader.yaml &&
+  --distro ubuntu --memory 2 --vcpus 2 --disk 15 > tmp/reader.yaml &&
   echo "Postgres reader created in Canada" &
 
 wait

gitea/deploy_gitea.sh

@@ -6,7 +6,7 @@ hostname=gitea-example
 set -e
 export FORMAT=YAML
 
-detee-cli vm deploy --public-ip --location Random --hostname $hostname > vm_info.tmp
+detee-cli vm deploy --public-ip --location Any --hostname $hostname > vm_info.tmp
 vm_uuid=$(grep 'uuid:' vm_info.tmp | awk '{ print $2 }')
 vm_ip=$(grep 'ip:' vm_info.tmp | awk '{ print $2 }')
 key_path=$(grep 'key_path:' vm_info.tmp | awk '{ print $2 }')

kubernetes/create_vms.sh

@@ -6,31 +6,31 @@ set -e
 mkdir -p tmp
 
 detee-cli vm deploy --hostname k3s-master --vcpus 2 \
-  --memory 3000 --disk 20 --location Random --public-ip |
+  --memory 3 --disk 20 --location Any --public-ip |
   tail -1 > tmp/master_ssh_command &&
   echo "k3s-master successfully created" &
 sleep 1
 
 detee-cli vm deploy --hostname k3s-node-1 --vcpus 2 \
-  --memory 3000 --disk 20 --location Random --public-ip |
+  --memory 3 --disk 20 --location Any --public-ip |
   tail -1 > tmp/node1_ssh_command &&
   echo "k3s-node-1 successfully created" &
 sleep 1
 
 detee-cli vm deploy --hostname k3s-node-2 --vcpus 2 \
-  --memory 3000 --disk 20 --location Random --public-ip |
+  --memory 3 --disk 20 --location Any --public-ip |
   tail -1 > tmp/node2_ssh_command &&
   echo "k3s-node-2 successfully created" &
 sleep 1
 
 detee-cli vm deploy --hostname k3s-node-3 --vcpus 2 \
-  --memory 3000 --disk 20 --location Random --public-ip |
+  --memory 3 --disk 20 --location Any --public-ip |
   tail -1 > tmp/node3_ssh_command &&
   echo "k3s-node-3 successfully created" &
 sleep 1
 
 detee-cli vm deploy --hostname k3s-node-4 --vcpus 2 \
-  --memory 3000 --disk 20 --location Random --public-ip |
+  --memory 3 --disk 20 --location Any --public-ip |
   tail -1 > tmp/node4_ssh_command &&
   echo "k3s-node-4 successfully created" &
 

overlay-network/setup_wg_mesh.sh

@@ -31,7 +31,7 @@ new_vm() {
   local vm_inspect_data="tmp/vms/${vm_name}_inspect.yaml"
 
   vm_node_ip=$(grep 'ip: ' $vm_install_data | awk '{ print $2 }')
-  vm_port=$(grep exposed_ports -A 1 $vm_inspect_data | tail -1 | grep -oE "[0-9]*")
+  vm_port=$(grep 'host_port: ' $vm_inspect_data | head -1 | awk '{ print $3 }' )
   wg_privkey=$(wg genkey)
   wg_pubkey=$(echo $wg_privkey | wg pubkey)
 

overlay-network/vm_configs/template-1.yaml

@@ -2,11 +2,11 @@
 
 hostname: template-1
 hours: 2
-price: 20000
+price: 1000
 location:
   country: "FR"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
-vcpus: 4
-memory_mb: 8000
-disk_size_gb: 60
+vcpus: 2
+memory_gib: 4
+disk_size_gib: 10

overlay-network/vm_configs/template-2.yaml

@@ -2,11 +2,10 @@
 
 hostname: template-2
 hours: 2
-price: 20000
+price: 1000
 location:
-  country: "GB"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
-vcpus: 4
-memory_mb: 8000
-disk_size_gb: 60
+vcpus: 2
+memory_gib: 4
+disk_size_gib: 10

overlay-network/vm_configs/template-3.yaml

@@ -2,11 +2,11 @@
 
 hostname: template-3
 hours: 2
-price: 20000
+price: 1000
 location:
   country: "US"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
-vcpus: 4
-memory_mb: 8000
-disk_size_gb: 60
+vcpus: 2
+memory_gib: 4
+disk_size_gib: 10

overlay-network/vm_configs/template-n.yaml

@@ -2,11 +2,11 @@
 
 hostname: template-n
 hours: 2
-price: 20000
+price: 1000
 location:
   country: "US"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
 vcpus: 2
-memory_mb: 4400
-disk_size_gb: 20
+memory_gib: 4
+disk_size_gib: 10

overlay-network/vm_configs/template-x.yaml

@@ -2,11 +2,11 @@
 
 hostname: template-x
 hours: 2
-price: 20000
+price: 1000
 location:
   country: "FR"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
-vcpus: 4
-memory_mb: 8000
-disk_size_gb: 60
+vcpus: 2
+memory_gib: 4
+disk_size_gib: 10

wireguard-bastion/cali-bastion.yaml

@@ -2,11 +2,11 @@
 
 hostname: cali-bastion
 hours: 5
-price: 20000
+price: 1000
 location:
   region: "California"
 ipv4: !PublishPorts [ 1337 ]
 public_ipv6: false
 vcpus: 2
-memory_mb: 2000
-disk_size_gb: 20
+memory_gib: 2
+disk_size_gib: 20

wireguard-bastion/cali-protected.yaml

@@ -2,11 +2,11 @@
 
 hostname: cali-protected
 hours: 5
-price: 20000
+price: 1000
 location:
   region: "California"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
 vcpus: 2
-memory_mb: 2000
-disk_size_gb: 20
+memory_gib: 2
+disk_size_gib: 20

wireguard-bastion/vanc-bastion.yaml

@@ -2,11 +2,11 @@
 
 hostname: vanc-bastion
 hours: 5
-price: 20000
+price: 1000
 location:
   city: "Montréal"
 ipv4: !PublishPorts [ 1337 ]
 public_ipv6: false
 vcpus: 2
-memory_mb: 2000
-disk_size_gb: 20
+memory_gib: 2
+disk_size_gib: 20

wireguard-bastion/vanc-protected.yaml

@@ -2,11 +2,11 @@
 
 hostname: vanc-protected
 hours: 5
-price: 20000
+price: 1000
 location:
   city: "Montréal"
 ipv4: !PublishPorts [ ]
 public_ipv6: false
 vcpus: 2
-memory_mb: 2000
-disk_size_gb: 20
+memory_gib: 2
+disk_size_gib: 20