Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update on username and password provisioning from keyvault secret #195

Merged
merged 4 commits into from
Dec 11, 2020
Merged

Update on username and password provisioning from keyvault secret #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a65c19
Patch CI standalone not failing when terraform fails
LaurentLesle Dec 11, 2020
3ac0e73
Merge branch 'master' into patch-vm-standalone
LaurentLesle Dec 11, 2020
b68079b
Update rover to rover:2012.0420
LaurentLesle Dec 11, 2020
1c055a5
Update rover:2012.1109
LaurentLesle Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// Container user to use in VSCode Online and GitHub Codespaces
"containerUser" : "vscode",
"remoteUser": "vscode",

// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
version: '3.7'
services:
rover:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
user: vscode

labels:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master-100.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
]

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
region: ["southeastasia"]

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master-sql-mi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
random_length: ['5']

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
]

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
region: ["southeastasia"]

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master-standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
]

container:
image: aztfmod/rover:2011.3012
image: aztfmod/rover:2012.1109
options: --user 0

steps:
Expand Down
2 changes: 2 additions & 0 deletions examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

current_folder=$(pwd)
cd standalone

Expand Down
2 changes: 2 additions & 0 deletions examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

current_folder=$(pwd)
cd standalone

Expand Down
2 changes: 2 additions & 0 deletions examples/networking/private_links/endpoints/centralized/standalone/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

current_folder=$(pwd)
cd standalone

Expand Down
4 changes: 2 additions & 2 deletions modules/compute/virtual_machine/vm_windows.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ resource "azurerm_windows_virtual_machine" "vm" {
location = var.location
resource_group_name = var.resource_group_name
size = each.value.size
admin_username = each.value.admin_username
admin_password = random_password.admin[local.os_type].result
admin_username = try(each.value.admin_user_key, null) == null ? each.value.admin_username : local.admin_user
admin_password = try(each.value.admin_password_key, null) == null ? random_password.admin[local.os_type].result : local.admin_password
network_interface_ids = local.nic_ids
allow_extension_operations = try(each.value.allow_extension_operations, null)
computer_name = azurecaf_name.windows_computer_name[each.key].result
Expand Down