Merge branch 'master' into no_storage

src/vfxt/README.md

@@ -12,6 +12,8 @@ The construction of this template and packaging for marketplace can be found in
 
 ## Managed Identity and Roles
 
+> **NOTE** - If you need information about what to enter in the "Avere cluster create role ID" field of the Create Avere vFXT deployment template, read the prerequisites documentation at [docs.microsoft.com/avere](https://docs.microsoft.com/azure/avere-vfxt/avere-vfxt-prereqs#create-access-roles). 
+
 The Avere vFXT controller and cluster use Azure [managed identities](https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview) for deployment and operation.  Additionally the administrator deploying the roles also needs permission to deploy the Avere vFXT controller and cluster.
 
 The following table shows the roles required for each of the avere operations:

src/vfxt/azuredeploy-auto.json

@@ -137,9 +137,8 @@
     },
     "avereInstanceType": {
       "type": "string",
-      "defaultValue": "Standard_D16s_v3",
+      "defaultValue": "Standard_E32s_v3",
       "allowedValues": [
-        "Standard_D16s_v3",
         "Standard_E32s_v3"
       ],
       "metadata": {

src/vfxt/azuredeploy-auto.parameters.json

@@ -39,7 +39,7 @@
       "value": "UNIQUE"
     },
     "avereInstanceType": {
-      "value": "Standard_D16s_v3"
+      "value": "Standard_E32s_v3"
     }
   }
 }

src/vfxt/azuredeploy-auto.parameters.new.vnet.json

@@ -27,7 +27,7 @@
       "value": "avere-cluster"
     },
     "avereInstanceType": {
-      "value": "Standard_D16s_v3"
+      "value": "Standard_E32s_v3"
     },
     "avereCacheSizeGB": {
       "value": 1024

src/vfxt/azuredeploy-auto.parameters.use.existingvnet.json

@@ -27,7 +27,7 @@
       "value": "avere-cluster"
     },
     "avereInstanceType": {
-      "value": "Standard_D16s_v3"
+      "value": "Standard_E32s_v3"
     },
     "avereCacheSizeGB": {
       "value": 1024

src/vfxt/src/base-template.json

@@ -137,9 +137,8 @@
     },
     "avereInstanceType": {
       "type": "string",
-      "defaultValue": "Standard_D16s_v3",
+      "defaultValue": "Standard_E32s_v3",
       "allowedValues": [
-        "Standard_D16s_v3",
         "Standard_E32s_v3"
       ],
       "metadata": {

src/vfxt/src/createUiDefinition.json

@@ -206,12 +206,10 @@
               "label": "Size",
               "toolTip": "The VM instance type to use for the Avere vFXT cluster nodes.",
               "recommendedSizes": [
-                "Standard_D16s_v3",
                 "Standard_E32s_v3"
               ],
               "constraints": {
                 "allowedSizes": [
-                  "Standard_D16s_v3",
                   "Standard_E32s_v3"
                 ]
               },

test/test_vfxt_template_deploy.py

@@ -29,7 +29,7 @@ class TestVfxtTemplateDeploy:
         with open(test_vars["ssh_pub_key"], "r") as ssh_pub_f:
             ssh_pub_key = ssh_pub_f.read()
         atd.deploy_params = {
-            "avereInstanceType": "Standard_D16s_v3",
+            "avereInstanceType": "Standard_E32s_v3",
             "avereClusterName": atd.deploy_id + "-cluster",
             "virtualNetworkResourceGroup": atd.resource_group,
             "virtualNetworkName": atd.deploy_id + "-vnet",