Consolidated config file to latest release

examples/bastion/config.json

@@ -1,86 +1,46 @@
 {
     "location": "variables.location",
     "resource_group": "variables.resource_group",
-    "install_from": "jumpbox",
+    "install_from": "",
     "admin_user": "hpcadmin",
     "variables": {
-        "hpc_image": "OpenLogic:CentOS-HPC:7.7:latest",
-        "win_image": "MicrosoftWindowsDesktop:Windows-10:rs5-pron:latest",
-        "win_password": "<NOT-SET>",
-        "location": "<NOT-SET>",
+        "jumpbox_image": "OpenLogic:CentOS:7.7:latest",
+        "location": "southcentralus",
         "resource_group": "<NOT-SET>",
-        "vm_type": "<NOT-SET>",
+        "vm_type": "Standard_D4s_v3",
+        "vnet_name": "hpcvnet",
         "low_priority": false,
-        "bastion_subnet": "10.2.2.0/27",
+        "bastion_subnet": "10.41.0.0/26",
         "bastion_name": "bastion",
-        "vnet_name": "hpcvnet",
         "rm_vm_name": "jumpbox",
-        "vnet_resource_group": "variables.resource_group"
+        "key_vault": "<NOT-SET>",
+        "storage_acc": "<NOT-SET>",
+        "vnet_resource_group": "variables.resource_group",
+        "jumpbox_pw": "secret.{{variables.key_vault}}.jumpbox_pw",
+        "customdata": "sasurl.{{variables.storage_acc}}.data/cloud-init.txt"
     },
     "vnet": {
         "resource_group": "variables.vnet_resource_group",
         "name": "variables.vnet_name",
-        "address_prefix": "10.2.0.0/20",
+        "address_prefix": "10.41.0.0/20",
         "subnets": {
-            "compute": "10.2.4.0/22"
+            "storage": "10.41.2.0/24",
+            "compute": "10.41.4.0/22"
         }
     },
     "resources": {
         "jumpbox": {
-            "type": "vm",
-            "vm_type": "variables.vm_type",
-            "public_ip": true,
-            "image": "variables.hpc_image",
-            "accelerated_networking": true,
-            "subnet": "compute",
-            "tags": [
-                "cndefault",
-                "localuser",
-                "disable-selinux"
-            ]
-        },
-        "winbox": {
-            "type": "vm",
-            "vm_type": "variables.vm_type",
-            "password": "variables.win_password",
-            "public_ip": false,
-            "image": "variables.win_image",
-            "accelerated_networking": true,
-            "subnet": "compute"
-        },
-        "headnode": {
             "type": "vm",
             "vm_type": "variables.vm_type",
             "public_ip": false,
-            "image": "variables.hpc_image",
+            "image": "variables.jumpbox_image",
             "accelerated_networking": true,
+            "custom_data": "variables.customdata",
             "subnet": "compute",
-            "tags": [
-                "cndefault",
-                "localuser",
-                "disable-selinux"
-            ]
+            "tags": []
         }
     },
     "install": [
-        {
-            "script": "disable-selinux.sh",
-            "tag": "disable-selinux",
-            "sudo": true
-        },
-        {
-            "script": "cndefault.sh",
-            "tag": "cndefault",
-            "sudo": true
-        },
-        {
-            "script": "localuser.sh",
-            "args": [
-                "$(<hostlists/tags/nfsserver)"
-            ],
-            "tag": "localuser",
-            "sudo": true
-        },
         {
             "type": "local_script",
             "script": "bastion.sh",
@@ -89,7 +49,7 @@
                 "variables.location",
                 "variables.bastion_subnet",
                 "variables.bastion_name",
-                "variables.vnet_name"
+                "variables.vnet_name" 
             ]
         },
         {
@@ -99,14 +59,6 @@
                 "variables.bastion_name",
                 "variables.resource_group"
             ]
-        },
-        {
-            "type": "local_script",
-            "script": "remove_vm.sh",
-            "args": [
-                "variables.resource_group",
-                "variables.rm_vm_name"
-            ]
         }
     ]
 }