Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
Prefix loadbalancers, application gateway and ip addresses with vmHos…
Browse files Browse the repository at this point in the history
…tNamePrefix (#285)

This commit updates the load balancer, application gateway and ip address resources to be prefixed with
the vmHostNamePrefix value. This would allow a cluster to be deployed into an existing resource group where
another cluster has been deployed with a different vmHostNamePrefix value.

Fixes #278
  • Loading branch information
russcam committed Jun 11, 2019
1 parent 08568c3 commit c36e419
Show file tree
Hide file tree
Showing 15 changed files with 770 additions and 995 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Deploying through the Marketplace is great and easy way to get your feet wet for

![Example UI Flow](images/ui.gif)

You can view the UI in developer mode by [clicking here](https://portal.azure.com/#blade/Microsoft_Azure_Compute/CreateMultiVmWizardBlade/internal_bladeCallId/anything/internal_bladeCallerParams/{"initialData":{},"providerConfig":{"createUiDefinition":"https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fazure-marketplace%2F7.1%2Fsrc%2FcreateUiDefinition.json"}}). If you feel something is cached improperly use [this client unoptimized link instead](https://portal.azure.com/?clientOptimizations=false#blade/Microsoft_Azure_Compute/CreateMultiVmWizardBlade/internal_bladeCallId/anything/internal_bladeCallerParams/{"initialData":{},"providerConfig":{"createUiDefinition":"https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fazure-marketplace%2F7.1%2Fsrc%2FcreateUiDefinition.json"}})
You can view the UI in developer mode by [clicking here](https://portal.azure.com/#blade/Microsoft_Azure_Compute/CreateMultiVmWizardBlade/internal_bladeCallId/anything/internal_bladeCallerParams/{"initialData":{},"providerConfig":{"createUiDefinition":"https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fazure-marketplace%2Fmaster%2Fsrc%2FcreateUiDefinition.json"}}). If you feel something is cached improperly use [this client unoptimized link instead](https://portal.azure.com/?clientOptimizations=false#blade/Microsoft_Azure_Compute/CreateMultiVmWizardBlade/internal_bladeCallId/anything/internal_bladeCallerParams/{"initialData":{},"providerConfig":{"createUiDefinition":"https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fazure-marketplace%2Fmaster%2Fsrc%2FcreateUiDefinition.json"}})

## Reporting bugs

Expand Down Expand Up @@ -568,7 +568,7 @@ value defined in the template.

### Web based deploy

<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fazure-marketplace%2F7.1%2Fsrc%2FmainTemplate.json" target="_blank">
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Felastic%2Fazure-marketplace%2Fmaster%2Fsrc%2FmainTemplate.json" target="_blank">
<img alt="Deploy to Azure" src="http://azuredeploy.net/deploybutton.png"/>
</a>

Expand Down Expand Up @@ -602,7 +602,7 @@ supported by the last release. It's recommended to update to [Azure CLI 2.0](htt
```sh
az group deployment create \
--resource-group <name> \
--template-uri https://raw.githubusercontent.com/elastic/azure-marketplace/7.1/src/mainTemplate.json \
--template-uri https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/mainTemplate.json \
--parameters @parameters/password.parameters.json
```

Expand All @@ -627,7 +627,7 @@ where `<name>` refers to the resource group you just created.

```powershell
$clusterParameters = @{
"artifactsBaseUrl"="https://raw.githubusercontent.com/elastic/azure-marketplace/7.1/src"
"artifactsBaseUrl"="https://raw.githubusercontent.com/elastic/azure-marketplace/master/src"
"esVersion" = "7.1.1"
"esClusterName" = "elasticsearch"
"loadBalancerType" = "internal"
Expand All @@ -653,7 +653,7 @@ where `<name>` refers to the resource group you just created.
5. Use our template directly from GitHub

```powershell
New-AzureRmResourceGroupDeployment -Name "<deployment name>" -ResourceGroupName "<name>" -TemplateUri "https://raw.githubusercontent.com/elastic/azure-marketplace/7.1/src/mainTemplate.json" -TemplateParameterObject $clusterParameters
New-AzureRmResourceGroupDeployment -Name "<deployment name>" -ResourceGroupName "<name>" -TemplateUri "https://raw.githubusercontent.com/elastic/azure-marketplace/master/src/mainTemplate.json" -TemplateParameterObject $clusterParameters
```

## Targeting a specific template version
Expand Down
2 changes: 1 addition & 1 deletion build/arm-tests/1d-xxl-0m-0c-ext-p.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"location" : "westeurope",
"parameters" : {
"loadBalancerType":{"value":"external"},
"kibana":{"value":"No"},
"kibana":{"value":"No"},
"jumpbox":{"value":"Yes"},
"vmSizeKibana":{"value":"Standard_DS1_v2"},
"vmSizeDataNodes":{"value":"Standard_D2s_v3"},
Expand Down
5 changes: 3 additions & 2 deletions build/arm-tests/3d-0m-0c-ext-kp-no-disks.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"isValid" : true,
"deploy" : true,
"why" : "Using temp disks",
"why" : "Using temp disks and host name prefix",
"location" : "westeurope",
"parameters" : {
"loadBalancerType":{"value":"external"},
"kibana":{"value":"Yes"},
"jumpbox":{"value":"No"},
"jumpbox":{"value":"Yes"},
"vmHostNamePrefix":{"value":"p-"},
"vmSizeKibana":{"value":"Standard_D1"},
"vmSizeDataNodes":{"value":"Standard_D1"},
"vmDataNodeCount":{"value":3},
Expand Down
Loading

0 comments on commit c36e419

Please sign in to comment.