Skip to content

Commit

Permalink
Merge pull request #2 from VaijanathB/master
Browse files Browse the repository at this point in the history
Getting the branch uptodate.
  • Loading branch information
VaijanathB authored Dec 19, 2017
2 parents 3bcb08d + 081ef39 commit 32dc775
Show file tree
Hide file tree
Showing 22 changed files with 270 additions and 207 deletions.
57 changes: 57 additions & 0 deletions SideLoad-CreateUIDefinition.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#Requires -Version 3.0
#Requires -Module Azure.Storage
#Requires -Module @{ModuleName="AzureRm.Profile";ModuleVersion="3.0"}

#use this script to side-load a createUIDefinition.json file in the Azure portal

[cmdletbinding()]
param(
$createUIDefFile='createUIDefinition.json',
$storageContainerName='createuidef',
[switch] $Gov
)

try {

$StorageAccountName = 'stage' + ((Get-AzureRmContext).Subscription.Id).Replace('-', '').substring(0, 19)
$StorageAccount = (Get-AzureRmStorageAccount | Where-Object{$_.StorageAccountName -eq $StorageAccountName})

# Create the storage account if it doesn't already exist
if ($StorageAccount -eq $null) {
$StorageResourceGroupName = 'ARM_Deploy_Staging'
New-AzureRmResourceGroup -Location "$ResourceGroupLocation" -Name $StorageResourceGroupName -Force
$StorageAccount = New-AzureRmStorageAccount -StorageAccountName $StorageAccountName -Type 'Standard_LRS' -ResourceGroupName $StorageResourceGroupName -Location "$ResourceGroupLocation"
}

New-AzureStorageContainer -Name $StorageContainerName -Context $StorageAccount.Context -ErrorAction SilentlyContinue *>&1


Set-AzureStorageBlobContent -Container $StorageContainerName -File $createUIDefFile -Context $storageAccount.Context -Force

$uidefurl = New-AzureStorageBlobSASToken -Container $StorageContainerName -Blob (Split-Path $createUIDefFile -leaf) -Context $storageAccount.Context -FullUri -Permission r
$encodedurl = [uri]::EscapeDataString($uidefurl)

if ($Gov) {

$target=@"
https://portal.azure.us/#blade/Microsoft_Azure_Compute/CreateMultiVmWizardBlade/internal_bladeCallId/anything/internal_bladeCallerParams/{"initialData":{},"providerConfig":{"createUiDefinition":"$encodedurl"}}
"@

}
else {

$target=@"
https://portal.azure.com/#blade/Microsoft_Azure_Compute/CreateMultiVmWizardBlade/internal_bladeCallId/anything/internal_bladeCallerParams/{"initialData":{},"providerConfig":{"createUiDefinition":"$encodedurl"}}
"@

}

Write-Host `n"File: "$uidefurl `n
Write-Host "Target URL: "$target

start $target

}
catch {
throw $_
}
3 changes: 2 additions & 1 deletion az-group-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ then
az storage account create -l "$location" --sku "Standard_LRS" -g "$artifactsResourceGroupName" -n "$artifactsStorageAccountName" 2>/dev/null
fi
else
artifactsResourceGroupName=$( az storage account list -o json | jq -r '.[] | select(.name == '\"$s\"') .resourceGroup' )
artifactsStorageAccountName=$storageAccountName
artifactsResourceGroupName=$( az storage account list -o json | jq -r '.[] | select(.name == '\"$storageAccountName\"') .resourceGroup' )
if [[ -z $artifactsResourceGroupName ]]
then
echo "Cannot find storageAccount: "$storageAccountName
Expand Down
5 changes: 5 additions & 0 deletions bosh-setup/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# v3.1.0 (2017-12-12)

- Bump [bosh-deployment](https://github.com/cloudfoundry/bosh-deployment/blob/ad5e958d15973269345909349fc00378abae4ba7/bosh.yml) and [cf-deployment](https://github.com/cloudfoundry/cf-deployment/blob/v1.3.1/cf-deployment.yml).
- Upgrade Azure CPI version to v33 except AzureStack. Please see new features in [bosh-azure-cpi-release v32](https://github.com/cloudfoundry-incubator/bosh-azure-cpi-release/releases/tag/v33)

# v3.0.0 (2017-11-23)

- The template is using [BOSH CLI v2](https://bosh.io/docs/cli-v2.html), [bosh-deployment](https://github.com/cloudfoundry/bosh-deployment/blob/cb8e7f60145738e103eb2dc0ad3372288986dc0c/bosh.yml) and [cf-deployment](https://github.com/cloudfoundry/cf-deployment/blob/v1.0.0/cf-deployment.yml).
Expand Down
27 changes: 17 additions & 10 deletions bosh-setup/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
"https://s3-us-west-1.amazonaws.com/cf-cli-releases/releases/v6.23.1/cf-cli-installer_6.23.1_x86-64.deb"
],
"baseUriAzureChinaCloud": "https://cloudfoundry.blob.core.chinacloudapi.cn/bosh-setup/",
"templateVersion": "v3-0-0",
"templateVersion": "v3-1-0",
"baseUriAzureChinaCloudWithVersion": "[concat(variables('baseUriAzureChinaCloud'), variables('templateVersion'), '/')]",
"filesToDownloadAzureChinaCloud": [
"[uri(variables('baseUriAzureChinaCloudWithVersion'), 'scripts/setup_env.sh')]",
Expand Down Expand Up @@ -231,23 +231,30 @@

"environmentAzure": {
"serviceHostBase": "[variables('coreUri')]",
"boshAzureCPIReleaseUrl": "https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-azure-cpi-release?v=29",
"boshAzureCPIReleaseSha1": "630901d22de58597ef8d5a23be9a5b7107d9ecb4",
"boshAzureCPIReleaseUrl": "https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-azure-cpi-release?v=33",
"boshAzureCPIReleaseSha1": "2ec048e7fd79ddadecf4c8eca30e5d0df0e821d0",
"boshCliUrl": "https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-2.0.28-linux-amd64",
"stemcellUrl": "https://bosh.io/d/stemcells/bosh-azure-hyperv-ubuntu-trusty-go_agent?v=3468.5",
"stemcellSha1": "f205118c32fda5d30fca58e6163843597ab56bc5"
"stemcellUrl": "https://bosh.io/d/stemcells/bosh-azure-hyperv-ubuntu-trusty-go_agent?v=3468.13",
"stemcellSha1": "6bdbf8eedb670595d4f2f417d3bd6d123694f4ca"
},
"environmentAzureCloud": "[variables('environmentAzure')]",
"environmentAzureUSGovernment": "[variables('environmentAzure')]",
"environmentAzureGermanCloud": "[variables('environmentAzure')]",
"environmentAzureStack": "[variables('environmentAzure')]",
"environmentAzureChinaCloud": {
"environmentAzureStack": {
"serviceHostBase": "[variables('coreUri')]",
"boshAzureCPIReleaseUrl": "https://mirror.azure.cn/bosh/bosh-azure-cpi-release/bosh-azure-cpi-release-29.tgz",
"boshAzureCPIReleaseUrl": "https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-azure-cpi-release?v=29",
"boshAzureCPIReleaseSha1": "630901d22de58597ef8d5a23be9a5b7107d9ecb4",
"boshCliUrl": "https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-2.0.28-linux-amd64",
"stemcellUrl": "https://bosh.io/d/stemcells/bosh-azure-hyperv-ubuntu-trusty-go_agent?v=3468.13",
"stemcellSha1": "6bdbf8eedb670595d4f2f417d3bd6d123694f4ca"
},
"environmentAzureChinaCloud": {
"serviceHostBase": "[variables('coreUri')]",
"boshAzureCPIReleaseUrl": "https://mirror.azure.cn/bosh/bosh-azure-cpi-release/bosh-azure-cpi-release-33.tgz",
"boshAzureCPIReleaseSha1": "2ec048e7fd79ddadecf4c8eca30e5d0df0e821d0",
"boshCliUrl": "[uri(variables('baseUriAzureChinaCloud'), 'bosh-cli/bosh-cli-2.0.28-linux-amd64')]",
"stemcellUrl": "https://mirror.azure.cn/bosh/bosh-azure-stemcells/bosh-stemcell-3468.5-azure-hyperv-ubuntu-trusty-go_agent.tgz",
"stemcellSha1": "f205118c32fda5d30fca58e6163843597ab56bc5"
"stemcellUrl": "https://mirror.azure.cn/bosh/bosh-azure-stemcells/bosh-stemcell-3468.13-azure-hyperv-ubuntu-trusty-go_agent.tgz",
"stemcellSha1": "6bdbf8eedb670595d4f2f417d3bd6d123694f4ca"
},
"environment": "[variables(concat('environment', parameters('environment')))]",

Expand Down
8 changes: 5 additions & 3 deletions bosh-setup/manifests/bosh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: bosh

releases:
- name: bosh
version: "264.1"
url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-264.1-ubuntu-trusty-3468.1-20171109-004207-628092428-20171109004211.tgz?versionId=46RkXfd52MvTfE_IXpC.P9x1Tfv09qkB
sha1: f262d1c35f3646a3f0394132f2705719c9d2bb6a
version: "264.4.0"
url: https://s3.amazonaws.com/bosh-compiled-release-tarballs/bosh-264.4.0-ubuntu-trusty-3468.13-20171209-002254-661672111-20171209002258.tgz?versionId=vbHJppHp1CezA1h5ccRYIxeWJhfMG3rQ
sha1: 113243c069ae0dcdc6c9ed3ca478ef8c6f1ef73a

resource_pools:
- name: vms
Expand Down Expand Up @@ -89,6 +89,8 @@ instance_groups:
enable_dedicated_status_worker: true
enable_nats_delivered_templates: true
workers: 4
local_dns:
enabled: true
events:
record_events: true
ssl:
Expand Down
119 changes: 52 additions & 67 deletions bosh-setup/manifests/cf-deployment.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: cf
manifest_version: v1.3.1
update:
canaries: 1
canary_watch_time: 30000-1200000
max_in_flight: 5
max_in_flight: 1
serial: false
update_watch_time: 5000-1200000
addons:
Expand Down Expand Up @@ -34,7 +35,6 @@ instance_groups:
vm_type: minimal
stemcell: default
update:
max_in_flight: 1
serial: true
networks:
- name: default
Expand All @@ -61,7 +61,6 @@ instance_groups:
vm_type: minimal
stemcell: default
update:
max_in_flight: 1
serial: true
networks:
- name: default
Expand Down Expand Up @@ -128,12 +127,6 @@ instance_groups:
consul_common: {from: consul_common_link}
consul_server: nil
consul_client: {from: consul_client_link}
properties:
consul:
agent:
services:
doppler:
name: doppler
- name: adapter
release: cf-syslog-drain
properties:
Expand Down Expand Up @@ -409,6 +402,7 @@ instance_groups:
url: https://uaa.((system_domain))
admin:
client_secret: "((uaa_admin_client_secret))"
logging_level: INFO
scim:
users:
- name: admin
Expand Down Expand Up @@ -699,13 +693,6 @@ instance_groups:
internal_api_password: "((cc_internal_api_password))"
staging_upload_user: staging_user
staging_upload_password: "((cc_staging_upload_password))"
quota_definitions:
default:
memory_limit: 102400
non_basic_services_allowed: true
total_routes: 1000
total_services: -1
total_reserved_route_ports: 100
buildpacks: &blobstore-properties
blobstore_type: webdav
webdav_config:
Expand Down Expand Up @@ -887,7 +874,6 @@ instance_groups:
- cf-router-network-properties
stemcell: default
update:
max_in_flight: 1
serial: true
networks:
- name: default
Expand Down Expand Up @@ -1188,7 +1174,6 @@ instance_groups:
vm_type: minimal
stemcell: default
update:
max_in_flight: 1
serial: true
networks:
- name: default
Expand Down Expand Up @@ -1628,13 +1613,13 @@ releases:
version: 1.0.15
sha1: 4dc65769e860095822497f37c4a0c6c1fc2794ec
- name: capi
url: https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.45.0
version: 1.45.0
sha1: 3ca25a7853302bdb9cabcd77ad3a4a3879dfe016
url: https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.46.0
version: 1.46.0
sha1: cf3170a2c35fff8960a899d7687351a05a87e2b6
- name: cf-mysql
url: https://bosh.io/d/github.com/cloudfoundry/cf-mysql-release?v=36.9.0
version: 36.9.0
sha1: adf3ad18f608cd0f045c4feeb08422947c1481a7
url: https://bosh.io/d/github.com/cloudfoundry/cf-mysql-release?v=36.10.0
version: 36.10.0
sha1: dadf405f2305b6f9b625c1e07bd58aa93caf3cbc
- name: cf-networking
url: https://bosh.io/d/github.com/cloudfoundry/cf-networking-release?v=1.8.1
version: 1.8.1
Expand All @@ -1644,37 +1629,37 @@ releases:
version: "39"
sha1: a2d557302a1026f685514b34792b81c0432a48c8
- name: cf-syslog-drain
url: https://bosh.io/d/github.com/cloudfoundry/cf-syslog-drain-release?v=3.1
version: "3.1"
sha1: 71f2df6f03591ce47428590e3d1a6641e62f2c93
url: https://bosh.io/d/github.com/cloudfoundry/cf-syslog-drain-release?v=4
version: "4"
sha1: 4966d56182e837530e5f1cf4974bd9a6f5f16b3b
- name: cflinuxfs2
url: https://bosh.io/d/github.com/cloudfoundry/cflinuxfs2-release?v=1.168.0
version: 1.168.0
sha1: cd5cfc8c73520b1d0c3a13b4ffaee7170edac762
url: https://bosh.io/d/github.com/cloudfoundry/cflinuxfs2-release?v=1.175.0
version: 1.175.0
sha1: bc909895b4a80204a24fea132fbae9ad6a3e4c8e
- name: consul
url: https://bosh.io/d/github.com/cloudfoundry-incubator/consul-release?v=190
version: "190"
sha1: 7a3dcd5a85fdedc8233b2e68b8aa9d97c46c3611
- name: diego
url: https://bosh.io/d/github.com/cloudfoundry/diego-release?v=1.30.0
version: 1.30.0
sha1: 09a1ba484bafe1ceb4752a46a5c1159fdd81fc23
url: https://bosh.io/d/github.com/cloudfoundry/diego-release?v=1.31.0
version: 1.31.0
sha1: 65bdcef711587ba6c4080b6fb83ce90a8073b378
- name: dotnet-core-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/dotnet-core-buildpack-release?v=1.0.30
version: 1.0.30
sha1: d9b909a9d627aee00a6196bef26d39f13acfea70
url: https://bosh.io/d/github.com/cloudfoundry/dotnet-core-buildpack-release?v=1.0.32
version: 1.0.32
sha1: dead1f05fd12042cf3e2c569830ef04c8d8c7110
- name: garden-runc
url: https://bosh.io/d/github.com/cloudfoundry/garden-runc-release?v=1.9.6
version: 1.9.6
sha1: 55fdcc0f2bda526f126d28827fbae7b21c6b0d1c
url: https://bosh.io/d/github.com/cloudfoundry/garden-runc-release?v=1.10.0
version: 1.10.0
sha1: 9c2ad4a961db49a5349a26d4240b8f8b9b54af88
- name: go-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/go-buildpack-release?v=1.8.13
version: 1.8.13
sha1: 4b494b5886db6f50ee3ca2ae849d2b94ed814d06
url: https://bosh.io/d/github.com/cloudfoundry/go-buildpack-release?v=1.8.14
version: 1.8.14
sha1: 61a694b6d45af74db816a681cc982f4ee943fd42
- name: java-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/java-buildpack-release?v=4.6
version: "4.6"
sha1: e9f6b1e7fe51079af70e7c42198f5e5201b7b663
url: https://bosh.io/d/github.com/cloudfoundry/java-buildpack-release?v=4.7
version: "4.7"
sha1: 9d8628aaaa6c03322f629dcbac79c7a2700c6ff3
- name: loggregator
url: https://bosh.io/d/github.com/cloudfoundry/loggregator-release?v=99
version: "99"
Expand All @@ -1684,38 +1669,38 @@ releases:
version: "22"
sha1: 1300071c7cf43f5d299a6eaec6f6bb6cca7eac3b
- name: nodejs-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/nodejs-buildpack-release?v=1.6.10
version: 1.6.10
sha1: ece42d02638e118f2b37ec1efa439d116fdc84bd
url: https://bosh.io/d/github.com/cloudfoundry/nodejs-buildpack-release?v=1.6.12
version: 1.6.12
sha1: ed71bdea8dd851ee09c14cc3bd85f48fa0b069d1
- name: php-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/php-buildpack-release?v=4.3.43
version: 4.3.43
sha1: f1d6d55dd3b110e02983ffbda6a8110af3aaa981
url: https://bosh.io/d/github.com/cloudfoundry/php-buildpack-release?v=4.3.44
version: 4.3.44
sha1: 114d60cd1605e8eee1c91df9b0b13bca7cc49374
- name: python-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/python-buildpack-release?v=1.6.1
version: 1.6.1
sha1: b23f54970a098f5f1345458d7ee8eba18c91cfc3
url: https://bosh.io/d/github.com/cloudfoundry/python-buildpack-release?v=1.6.3
version: 1.6.3
sha1: 61020f1cfa82b0a2f75ca5e54c6a945dfc14f9b4
- name: routing
url: https://bosh.io/d/github.com/cloudfoundry-incubator/cf-routing-release?v=0.166.0
version: 0.166.0
sha1: 281941aa133070cbbfa6b494e68d0d53121c0a9a
url: https://bosh.io/d/github.com/cloudfoundry-incubator/cf-routing-release?v=0.168.0
version: 0.168.0
sha1: 885321f95b530c4a5b8515c72155229cba26c449
- name: ruby-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/ruby-buildpack-release?v=1.7.5
version: 1.7.5
sha1: 4c18ac798a8deffbfde4c2ed141086d8bd2f2952
url: https://bosh.io/d/github.com/cloudfoundry/ruby-buildpack-release?v=1.7.7
version: 1.7.7
sha1: 45249ae127be23e0cc83e9c4bb4968b533715098
- name: staticfile-buildpack
url: https://bosh.io/d/github.com/cloudfoundry/staticfile-buildpack-release?v=1.4.18
version: 1.4.18
sha1: fbed3cd8f1a2b4506ba68226bd554d244a13831a
url: https://bosh.io/d/github.com/cloudfoundry/staticfile-buildpack-release?v=1.4.20
version: 1.4.20
sha1: fa42d85b46a92a676ed2a9591b6980b1edf419c5
- name: statsd-injector
url: https://bosh.io/d/github.com/cloudfoundry/statsd-injector-release?v=1.0.30
version: 1.0.30
sha1: b0f201e0341af9736848514c76149070ea902e41
- name: uaa
url: https://bosh.io/d/github.com/cloudfoundry/uaa-release?v=52.2
version: "52.2"
sha1: a10ad45747edd6dcc4d891d3b349223d0d2f8439
url: https://bosh.io/d/github.com/cloudfoundry/uaa-release?v=53
version: "53"
sha1: 05d5005050f286939dc92baa89b5a7381c6a280e
stemcells:
- alias: default
os: ubuntu-trusty
version: "3468.5"
version: "3468.13"
2 changes: 1 addition & 1 deletion bosh-setup/manifests/cpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
path: /releases/-
value:
name: bosh-azure-cpi
version: 29
version: 33
url: ((cpi_release_url))
sha1: ((cpi_release_sha1))

Expand Down
6 changes: 3 additions & 3 deletions bosh-setup/manifests/jumpbox-user.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
path: /releases/name=os-conf?
value:
name: os-conf
version: 12
url: https://bosh.io/d/github.com/cloudfoundry/os-conf-release?v=12
sha1: af5a2c9f228b9d7ec4bd051d71fef0e712fa1549
version: 18
url: https://bosh.io/d/github.com/cloudfoundry/os-conf-release?v=18
sha1: 78d79f08ff5001cc2a24f572837c7a9c59a0e796

- type: replace
path: /instance_groups/name=bosh/properties/director/default_ssh_options?/gateway_user
Expand Down
Loading

0 comments on commit 32dc775

Please sign in to comment.