Skip to content

Commit

Permalink
Add support for Elastic Stack 6.x (elastic#165)
Browse files Browse the repository at this point in the history
* Add 6.x versions to the template

This commit adds the 6.x versions of Elasticsearch to the template.
A unqiue bootstrap password is generated within the template and passed to Elasticsearch setup script to set the bootstrap.password in the keystore.
Inverted all 5.x Elasticsearch version checks to use 2.x, since commands are the same across 5.x and and 6.x.

* Rename INSTALL_PLUGINS to INSTALL_XPACK

This commit renames INSTALL_PLUGINS variable to INSTALL_XPACK. The commercial plugins
are separate in 2.x but bundled as one X-Pack plugin in 5.x and 6.x. Since the majority of
installations now install with the one X-Pack plugin, rename the variable to reflect this.

* Remove kibana4_server generated password

This commit better aligns the es_kibana user in 2.x and the built-in kibana user in 5.x+.

In 2.x, the es_kibana user is now assigned the kibana4_server role and the kibana4 role
is removed. Kibana will use the es_kibana user credentials when interacting with Elasticsearch.

In 5.x+, the kibana built-in user will use the password supplied for the kibana user and the
es_kibana user is removed. Kibana will use the kibana user credentials when interacting
with Elasticsearch.

This change simplifies the template and a user will now always know the credentials used
by Kibana.

Closes elastic#32

* Allow bootstrap.password to be supplied

This commit adds a parameter to allow a user to set the bootstrap.password added to the keystore to set up built-in users.
It can be useful to know this value in the event one needs to re-set up built-in users, and it avoids the need to log in to
each node to set it to a known value.

If not supplied, a unique value is generated within the ARM template, using the uniqueString() function seeded with
the resourceGroup id, deployment name and securityAdminPassword.

* Add logstash_system user password parameter

This commit adds a parameter for the logstash_system built-in user account in Elasticsearch 5.2.0+.

Rename all remnants of kibana4 to simply kibana.

* Add mount options and remove sudo calls in disk partitioning

  Add support to change mount options.
  Include nofail into default mount options as recommended in https://docs.microsoft.com/en-us/azure/virtual-machines/linux/add-disk
  Remove sudo calls within the script. Must be run as root already and using sudo does not transfer environment variables.

* Increase retries to 60

  Increase the number of retries made to see when Elasticsearch is up to 60, so that we wait a total of up to 5 minutes for the node to come up.

* Comment out conf-enabled include in monit configuration

  conf-enabled include is not needed and contains no files, so comment out from monit configuration to suppress the superfluous warning written to stderr.

* Write log files to /var/log/elasticsearch

  When unspecified, Elasticsearch 6.x will attempt to write log files to /usr/share/elasticsearch/logs which the elasticsearch user under which the service runs does not have access to do. This can be observed
in the monit log with

cat /var/log/monit.log

which looks similar to

[UTC Feb 12 22:37:07] info     :  New Monit id: 4c9c50e3bff3365388e922d50b305764
 Stored in '/var/lib/monit/id'
[UTC Feb 12 22:37:07] info     : Starting Monit 5.16 daemon
[UTC Feb 12 22:37:07] info     : 'data-0' Monit 5.16 started
[UTC Feb 12 22:37:15] info     : Reinitializing monit daemon
[UTC Feb 12 22:37:15] info     : Awakened by the SIGHUP signal
Reinitializing Monit - Control file '/etc/monit/monitrc'
[UTC Feb 12 22:37:15] error    : Cannot create socket to [localhost]:2812 -- Connection refused
[UTC Feb 12 22:37:15] warning  : /etc/monit/monitrc:290: Include failed -- Success '/etc/monit/conf-enabled/*'
[UTC Feb 12 22:37:15] info     : Starting Monit HTTP server at [localhost]:2812
[UTC Feb 12 22:37:15] info     : Monit HTTP server started
[UTC Feb 12 22:37:15] info     : 'data-0' Monit reloaded
[UTC Feb 12 22:37:15] error    : 'elasticsearch' process is not running
[UTC Feb 12 22:37:15] info     : 'elasticsearch' trying to restart
[UTC Feb 12 22:37:15] info     : 'elasticsearch' start: /etc/init.d/elasticsearch
[UTC Feb 12 22:37:45] error    : 'elasticsearch' failed to start (exit status 1) -- /etc/init.d/elasticsearch:  * Starting Elasticsearch Server
2018-02-12 22:37:17,914 main ERROR Unable to create file /usr/share/elasticsearch/logs/russ-test-6x.log java.io.IOException: Could not create directory /usr/share/elasticsearch/logs
        at org.apach
[UTC Feb 12 22:38:15] error    : 'elasticsearch' process is not running
[UTC Feb 12 22:38:15] info     : 'elasticsearch' trying to restart
[UTC Feb 12 22:38:15] info     : 'elasticsearch' start: /etc/init.d/elasticsearch
[UTC Feb 12 22:38:46] error    : 'elasticsearch' failed to start (exit status 1) -- /etc/init.d/elasticsearch:  * Starting Elasticsearch Server
2018-02-12 22:38:18,292 main ERROR Unable to create file /usr/share/elasticsearch/logs/russ-test-6x.log java.io.IOException: Could not create directory /usr/share/elasticsearch/logs
        at org.apach

Explicitly set path.logs to /var/log/elasticsearch.log.
It may be useful set the location to a datadisk, if available, in future.

* Always specify Content-Type in curl requests

* Remove all usage of sudo

Script runs elevated already.

* Disallow Standard_A0 and Standard_A1 SKUs for Kibana VM

The Kibana process that optimizes and caches browser bundles for plugins and
on startup currently requires > 1.5Gb RAM.

For 6.x, a Standard_A1 SKU VM has been found to have insufficient RAM and CPU
for the optimizer process of Kibana X-Pack.

* Update 14.04 SKU for Elasticsearch 2.x

* Remove unreachable branch

Kibana 5.x+ installations use the deb package rather than the tar archive,
so remove unreachable branch in old_download_unzip_kibana() function

* Set path.data for non-data nodes

When unspecified, Elasticsearch 6.x will attempt to write data to /usr/share/elasticsearch/data which
the elasticsearch user under which the service runs does not have access to.

This can be seen in the elasticsearch.log as similar to

[2018-02-13T05:19:08,503][ERROR][o.e.b.Bootstrap          ] Exception
java.lang.IllegalStateException: Unable to access 'path.data' (/usr/share/elasticsearch/data)
        at org.elasticsearch.bootstrap.FilePermissionUtils.addDirectoryPath(FilePermissionUtils.java:70) ~[elasticsearch-6.2.1.jar:6.2.1]
        at org.elasticsearch.bootstrap.Security.addFilePermissions(Security.java:307) ~[elasticsearch-6.2.1.jar:6.2.1]
        at org.elasticsearch.bootstrap.Security.createPermissions(Security.java:262) ~[elasticsearch-6.2.1.jar:6.2.1]
        ...

* Update README

This commit adds the new parameters introduced to support 6.x.
Tidy up descriptions for existing parameters.

* Fixed 'npm run test-deploy' and 'npm run test' to account for new parameters

* Check the elastic user exists

This commit guards against the case where the bootstrap password is the
 same as the elastic superuser password for 5.x and 6.x clusters. In
this scenario, the .security index should also be checked to ensure the
elastic superuser has been created. The _xpack/security/user/elastic
endpoint cannot be used for this because it may return details related
to the bootstrap user.

* Remove EOL'ed 2.x versions

This commit removes the ability to deploy 2.x versions of Elasticsearch
and associated Kibana that are no longer supported by Elastic based on:

https://www.elastic.co/support/eol

* Remove java8 apt package patching

oracle-java8-installer apt package has now been updated to use 161:
https://launchpad.net/~webupd8team/+archive/ubuntu/java

Remove the patching of the apt-package and rely on the package as is
  • Loading branch information
russcam authored Feb 20, 2018
1 parent e821ee7 commit 9cfb04a
Show file tree
Hide file tree
Showing 25 changed files with 10,411 additions and 409 deletions.
50 changes: 37 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Check out our [examples repository](https://github.com/elastic/azure-marketplace
<tr><td>azureCloudPlugin</td><td>string</td>
<td>Either <code>Yes</code> or <code>No</code> to install the Azure Cloud plugin for snapshot/restore.
When set to <code>Yes</code>, both <code>azureCloudeStorageAccountName</code>
and <code>azureCloudStorageAccountKey</code> should be specified to configure the plugin correctly.
and <code>azureCloudStorageAccountKey</code> must be specified to configure the plugin correctly.
</td><td><code>No</code></td></tr>

<tr><td>azureCloudStorageAccountName</td><td>string</td>
Expand All @@ -110,7 +110,7 @@ Check out our [examples repository](https://github.com/elastic/azure-marketplace

<tr><td>xpackPlugins</td><td>string</td>
<td>Either <code>Yes</code> or <code>No</code> to install a trial license of the commercial <see href="https://www.elastic.co/products/x-pack">X-Pack</a>
plugins: Monitoring, Security, Alerting and Graph (Elasticsearch 2.3.0+).
plugins: Monitoring, Security, Alerting, Graph (Elasticsearch 2.3.0+) and Machine Learning (5.5.0+).
</td><td><code>Yes</code></td></tr>

<tr><td>esAdditionalPlugins</td><td>string</td>
Expand All @@ -124,13 +124,13 @@ Check out our [examples repository](https://github.com/elastic/azure-marketplace
<tr><td>kibana</td><td>string</td>
<td>Either <code>Yes</code> or <code>No</code> to provision a machine with a public IP that
has Kibana installed on it. If you have opted to also install the Elasticsearch plugins using <code>xpackPlugins</code> then
a trial license of the commercial <see href="https://www.elastic.co/products/x-pack">X-Pack</a> Kibana plugins as well as <a href="https://www.elastic.co/guide/en/sense/current/introduction.html">Sense Editor</a> are also installed.
a trial license of the commercial <see href="https://www.elastic.co/products/x-pack">X-Pack</a> Kibana plugins as well as <a href="https://www.elastic.co/guide/en/sense/current/introduction.html">Sense Editor (Kibana 4.x)</a> are also installed.
</td><td><code>Yes</code></td></tr>

<tr><td>vmSizeKibana</td><td>string</td>
<td>Azure VM size of the Kibana instance. See <a href="https://github.com/elastic/azure-marketplace/blob/master/build/allowedValues.json">this list for supported sizes</a>.
<strong>Check that the size you choose is <a href="https://azure.microsoft.com/en-au/regions/services/">available in the region you choose</a></strong>.
</td><td><code>Standard_A1</code></td></tr>
</td><td><code>Standard_A2</code></td></tr>

<tr><td>kibanaCertBlob</td><td>string</td>
<td>A Base-64 encoded form of the certificate (.crt) to secure HTTPS communication between the browser and Kibana.</td><td><code>""</code></td></tr>
Expand All @@ -142,12 +142,14 @@ Check out our [examples repository](https://github.com/elastic/azure-marketplace
<td>The passphrase to decrypt the private key. Optional as the key may not be encrypted. Supported only in 5.3.0+</td><td><code>""</code></td></tr>

<tr><td>jumpbox</td><td>string</td>
<td>Either <code>Yes</code> or <code>No</code> to optionally add a virtual machine to the deployment which you can use to connect and
manage virtual machines on the internal network.
</td><td><code>No</code></td></tr>
<td>Either <code>Yes</code> or <code>No</code> to optionally add a virtual machine with a public IP to the deployment, which you can use to connect and manage virtual machines on the internal network.
<br /><br />
NOTE: If you are deploying Kibana, the Kibana virtual machine can act
as a jumpbox.
</td><td><code>No</code></td></tr>

<tr><td>vmHostNamePrefix</td><td>string</td>
<td>The prefix to use for hostnames when naming virtual machines in the cluster. Hostnames are used for resolution of master nodes so if you are deploying a cluster into an existing virtual network containing an existing Elasticsearch cluster, be sure to set this to a unique prefix, to differentiate the hostnames of this cluster from an existing cluster. Can be up to 5 characters in length, must begin with an alphanumeric character and can contain alphanumeric and hyphen characters.
<td>The prefix to use for hostnames when naming virtual machines in the cluster. Hostnames are used for resolution of master nodes on the network, so if you are deploying a cluster into an existing virtual network containing an existing Elasticsearch cluster, be sure to set this to a unique prefix, to differentiate the hostnames of this cluster from an existing cluster. Can be up to 5 characters in length, must begin with an alphanumeric character and can contain alphanumeric and hyphen characters.
</td><td><code>""</code></td></tr>

<tr><td>vmSizeDataNodes</td><td>string</td>
Expand All @@ -171,7 +173,7 @@ Check out our [examples repository](https://github.com/elastic/azure-marketplace
</td><td><code>40</code><br />i.e. the max supported disks for data node VM size</td></tr>

<tr><td>vmDataDiskSize</td><td>string</td>
<td>The disk size of each attached disk. Choose <code>Large</code> (1024Gb), <code>Medium</code> (512Gb) or <code>Small</code> (128Gb).
<td>The disk size of each attached disk. Choose <code>Large</code> (1023Gb), <code>Medium</code> (512Gb) or <code>Small</code> (128Gb).
For Premium Storage, disk sizes equate to <a href="https://docs.microsoft.com/en-us/azure/storage/storage-premium-storage#premium-storage-disks-limits">P30, P20 and P10</a>
storage disk types, respectively.
</td>
Expand Down Expand Up @@ -223,22 +225,44 @@ Check out our [examples repository](https://github.com/elastic/azure-marketplace
<td>When <code>authenticationType</code> is <code>sshPublicKey</code> this sets the OS level sshKey that can be used to login.
</td><td><code>""</code></td></tr>

<tr><td>securityBootstrapPassword</td><td>securestring</td>
<td>Security password for 6.x <a href="https://www.elastic.co/guide/en/x-pack/current/setting-up-authentication.html#bootstrap-elastic-passwords"><code>bootstrap.password</code> key</a> that is added to the keystore. If no value is supplied, a 13 character password
will be generated using the ARM template <code>uniqueString()</code> function. The bootstrap password is used to seed the built-in
users. Used only in 6.0.0+
</td><td><code>""</code></td></tr>

<tr><td>securityAdminPassword</td><td>securestring</td>
<td>The password for 5.x's superuser <code>elastic</code> or, in 2.x the <code>es_admin</code> user, with admin role.
<td>Security password Admin user.
<ul>
<li>for 5.x+, built-in <code>elastic</code> user</li>
<li>for 2.x, the <code>es_admin</code> user, with <code>admin</code> role</li>
</ul>
must be &gt; 6 characters
</td><td><code>""</code></td></tr>

<tr><td>securityReadPassword</td><td>securestring</td>
<td>Security password for the <code>es_read</code> user with user (read-only) role, must be &gt; 6 characters
</td><td><code>""</code></td></tr>

<tr><td>securityKibanaPassword</td><td>securestring</td>
<td>Security password for the <code>es_kibana</code> user with kibana4 role, must be &gt; 6 characters
<td>Security password Kibana.
<ul>
<li>for 5.x+, built-in <code>kibana</code> user</li>
<li>for 2.x, the <code>es_kibana</code> user with <code>kibana4_server role</code></li>
</ul>
must be &gt; 6 characters
</td><td><code>""</code></td></tr>

<tr><td>securityLogstashPassword</td><td>securestring</td>
<td>Security password for 5.2.0+ built-in <code>logstash_system</code> user. Only used in 5.2.0+.
<br />
must be &gt; 6 characters
</td><td><code>""</code></td></tr>

<tr><td>location</td><td>string</td>
<td>The location where to provision all the items in this template. Defaults to the special <code>ResourceGroup</code> value which means it will inherit the location
<td>The location where to provision all the items in this template. Defaults to the special <code>[resourceGroup().location]</code> value which means it will inherit the location
from the resource group. Any other value must be a valid <a href="https://azure.microsoft.com/regions/">Azure region</a>.
</td><td><code>ResourceGroup</code></td></tr>
</td><td><code>[resourceGroup().location]</code></td></tr>

<tr><td>vNetNewOrExisting</td><td>string</td>
<td>Whether the Virtual Network is <code>new</code> or <code>existing</code>. An <code>existing</code> Virtual Network in
Expand Down
2 changes: 1 addition & 1 deletion build/.test.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
"securityPassword" : "",
"ssh" : ""
}
}
}
6 changes: 3 additions & 3 deletions build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This will patch the templates according to the configured `build/allowedValues.j
The result will be a distribution zip under `dist/elasticsearch-marketplace-DATE.zip` ready to be uploaded to the publisher portal.


# Development
## Development

New features should be developed on separate branches and merged back into `master` once complete. To aid in the development process, a gulp task is configured to update all of the github template urls to point at a specific branch so that UI definition and web based deployments can be tested. To run the task

Expand All @@ -44,7 +44,7 @@ where
- `<username>` is your github username and `<repo>` is the name of the Azure Marketplace github repository. Defaults to the remote origin repository.
- `<branch>` is the name of the branch. Defaults to the name of the current branch

# Test
## Test

For this you need to create a [Create a Service Principal - Azure CLI](https://github.com/cloudfoundry-incubator/bosh-azure-cpi-release/blob/master/docs/get-started/create-service-principal.md).

Expand Down Expand Up @@ -76,7 +76,7 @@ $ npm run azure-cleanup
```
Will remove all resource-groups starting with `test-*`

# Automated ui tests
## Automated UI tests

The automated ui tests are not (yet) part of the main test command to run them:

Expand Down
27 changes: 15 additions & 12 deletions build/allowedValues.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
{
"versions": {
"2.0.2": {
"kibana": "4.2.2"
},
"2.1.2": {
"kibana": "4.3.3"
},
"2.2.2": {
"kibana": "4.4.2"
},
"2.3.5": {
"kibana": "4.5.4"
},
"2.4.4": {
"kibana": "4.6.4"
},
Expand Down Expand Up @@ -56,6 +44,18 @@
},
"5.6.6": {
"kibana": "5.6.6"
},
"5.6.7": {
"kibana": "5.6.7"
},
"6.0.1": {
"kibana": "6.0.1"
},
"6.1.3": {
"kibana": "6.1.3"
},
"6.2.1": {
"kibana": "6.2.1"
}
},
"numberOfDataNodes" : 50,
Expand Down Expand Up @@ -130,6 +130,9 @@
"ignoredVmsBecauseWeHaveNo40DisksResource" : [
"D15_v2", "DS15_v2"
],
"ignoredKibanaVmsBecauseNotEnoughRam" : [
"Standard_A0", "Standard_A1"
],
"userJobTitle": [
"IT Executive (CIO, CTO, VP Engineering, etc.)",
"Business Executive (CEO, COO, CMO, etc.)",
Expand Down
44 changes: 44 additions & 0 deletions build/arm-tests/1000d-0m-0c-ext-kp0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"isValid" : false,
"deploy" : false,
"why" : "We expect this to hit the core limit because westus location is using the default core quota limits",
"location" : "westus",
"parameters" : {
"loadBalancerType":{"value":"external"},
"kibana":{"value":"Yes"},
"jumpbox":{"value":"No"},
"vmSizeKibana":{"value":"Standard_D1"},
"vmSizeDataNodes":{"value":"Standard_D1"},
"vmDataNodeCount":{"value":1000},
"vmDataDiskCount":{"value":40},
"vmDataDiskSize":{"value":"Small"},
"storageAccountType":{"value":"Default"},
"dataNodesAreMasterEligible":{"value":"Yes"},
"vmSizeMasterNodes":{"value":"Standard_DS2"},
"vmClientNodeCount":{"value":0},
"vmSizeClientNodes":{"value":"Standard_D1"},
"authenticationType":{"value":"password"},
"vNetName": {"value": "es-net"},
"vNetClusterSubnetName": {"value": "es-subnet"},
"vNetAppGatewaySubnetName": {"value": "es-app-gateway"},
"vNetLoadBalancerIp": {"value": "10.0.0.4"},
"vNetNewOrExisting": {"value":"new"},
"vNetExistingResourceGroup": {"value": ""},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewClusterSubnetAddressPrefix": {"value": "10.0.0.0/25"},
"vNetNewAppGatewaySubnetAddressPrefix": {"value": "10.0.0.128/28"},
"appGatewayTier": {"value":"Standard"},
"appGatewaySku": {"value":"Small"},
"appGatewayCount": {"value":1},
"appGatewayCertBlob": {"value":""},
"appGatewayCertPassword": {"value":""},
"appGatewayWafStatus": {"value":"Disabled"},
"appGatewayWafMode": {"value":"Detection"},
"userCompany": { "value": "" },
"userEmail": { "value": "" },
"userFirstName": { "value": "" },
"userLastName": { "value": "" },
"userJobTitle": { "value": "Other" },
"userCountry": { "value": "" }
}
}
6 changes: 3 additions & 3 deletions build/arm-tests/120d-3m-30c-ext-kp.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"vNetLoadBalancerIp": {"value": "10.0.0.4"},
"vNetNewOrExisting": {"value":"new"},
"vNetExistingResourceGroup": {"value": ""},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewClusterSubnetAddressPrefix": {"value": "10.0.0.0/25"},
"vNetNewAppGatewaySubnetAddressPrefix": {"value": "10.0.0.128/28"},
"appGatewayTier": {"value":"Standard"},
Expand All @@ -36,9 +36,9 @@
"appGatewayWafMode": {"value":"Detection"},
"userCompany": { "value": "" },
"userEmail": { "value": "" },
"userFirstName": { "value": "" },
"userFirstName": { "value": "" },
"userLastName": { "value": "" },
"userJobTitle": { "value": "Other" },
"userCountry": { "value": "" }
"userCountry": { "value": "" }
}
}
6 changes: 3 additions & 3 deletions build/arm-tests/3d-0m-0c-ags-ks.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"vNetLoadBalancerIp": {"value": "10.0.0.4"},
"vNetNewOrExisting": {"value":"new"},
"vNetExistingResourceGroup": {"value": ""},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewClusterSubnetAddressPrefix": {"value": "10.0.0.0/25"},
"vNetNewAppGatewaySubnetAddressPrefix": {"value": "10.0.0.128/28"},
"appGatewayTier": {"value":"Standard"},
Expand All @@ -36,9 +36,9 @@
"appGatewayWafMode": {"value":"Detection"},
"userCompany": { "value": "" },
"userEmail": { "value": "" },
"userFirstName": { "value": "" },
"userFirstName": { "value": "" },
"userLastName": { "value": "" },
"userJobTitle": { "value": "Other" },
"userCountry": { "value": "" }
"userCountry": { "value": "" }
}
}
6 changes: 3 additions & 3 deletions build/arm-tests/3d-0m-0c-agw-ks.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"vNetLoadBalancerIp": {"value": "10.0.0.4"},
"vNetNewOrExisting": {"value":"new"},
"vNetExistingResourceGroup": {"value": ""},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewClusterSubnetAddressPrefix": {"value": "10.0.0.0/25"},
"vNetNewAppGatewaySubnetAddressPrefix": {"value": "10.0.0.128/28"},
"appGatewayTier": {"value":"WAF"},
Expand All @@ -36,9 +36,9 @@
"appGatewayWafMode": {"value":"Detection"},
"userCompany": { "value": "" },
"userEmail": { "value": "" },
"userFirstName": { "value": "" },
"userFirstName": { "value": "" },
"userLastName": { "value": "" },
"userJobTitle": { "value": "Other" },
"userCountry": { "value": "" }
"userCountry": { "value": "" }
}
}
16 changes: 8 additions & 8 deletions build/arm-tests/3d-3m-3c-int-jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
"vNetLoadBalancerIp": {"value": "10.0.0.4"},
"vNetNewOrExisting": {"value":"new"},
"vNetExistingResourceGroup": {"value": ""},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewAddressPrefix": {"value": "10.0.0.0/24"},
"vNetNewClusterSubnetAddressPrefix": {"value": "10.0.0.0/25"},
"vNetNewAppGatewaySubnetAddressPrefix": {"value": "10.0.0.128/28"},
"appGatewayTier": {"value":"Standard"},
"appGatewaySku": {"value":"Small"},
"appGatewayCount": {"value":1},
"appGatewayCertBlob": {"value":""},
"appGatewayCertPassword": {"value":""},
"appGatewayWafStatus": {"value":"Disabled"},
"appGatewayWafMode": {"value":"Detection"},
"appGatewayCount": {"value":1},
"appGatewayCertBlob": {"value":""},
"appGatewayCertPassword": {"value":""},
"appGatewayWafStatus": {"value":"Disabled"},
"appGatewayWafMode": {"value":"Detection"},
"userCompany": { "value": "" },
"userEmail": { "value": "" },
"userFirstName": { "value": "" },
"userFirstName": { "value": "" },
"userLastName": { "value": "" },
"userJobTitle": { "value": "Other" },
"userCountry": { "value": "" }
"userCountry": { "value": "" }
}
}
44 changes: 0 additions & 44 deletions build/arm-tests/50d-0m-0c-ext-kp0.json

This file was deleted.

Loading

0 comments on commit 9cfb04a

Please sign in to comment.