Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion azure/cpi-secondary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
resource_group_name: unused
ssh_public_key: unused
ssh_user: unused
storage_account_name: unused
subscription_id: unused
tenant_id: unused
use_managed_disks: true
4 changes: 2 additions & 2 deletions azure/cpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
resource_group_name: ((resource_group_name))
ssh_public_key: ((ssh.public_key))
ssh_user: vcap
storage_account_name: ((storage_account_name))
subscription_id: ((subscription_id))
tenant_id: ((tenant_id))
use_managed_disks: true
- path: /cloud_provider/properties/azure?
type: replace
value:
Expand All @@ -57,9 +57,9 @@
resource_group_name: ((resource_group_name))
ssh_public_key: ((ssh.public_key))
ssh_user: vcap
storage_account_name: ((storage_account_name))
subscription_id: ((subscription_id))
tenant_id: ((tenant_id))
use_managed_disks: true
- path: /variables/-
type: replace
value:
Expand Down
15 changes: 2 additions & 13 deletions azure/use-managed-disks.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
# Managed disks are now enabled by default in azure/cpi.yml.
# Keeping this ops-file for backwards compatibility.
---
Comment thread
aramprice marked this conversation as resolved.
- type: replace
path: /instance_groups/name=bosh/properties/azure/use_managed_disks?
value: true

- type: remove
path: /instance_groups/name=bosh/properties/azure/storage_account_name

- type: replace
path: /cloud_provider/properties/azure/use_managed_disks?
value: true

- type: remove
path: /cloud_provider/properties/azure/storage_account_name
4 changes: 0 additions & 4 deletions tests/run-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ bosh create-env bosh.yml \
-v client_id=test \
-v client_secret=test \
-v resource_group_name=test \
-v storage_account_name=test \
-v default_security_group=nsg-bosh

echo "- Azure (custom-environment)"
Expand All @@ -465,7 +464,6 @@ bosh create-env bosh.yml \
-v client_id=test \
-v client_secret=test \
-v resource_group_name=test \
-v storage_account_name=test \
-v default_security_group=nsg-bosh

echo "- Azure (managed-identity)"
Expand All @@ -483,7 +481,6 @@ bosh create-env bosh.yml \
-v subscription_id=test \
-v azure-managed-identity=test \
-v resource_group_name=test \
-v storage_account_name=test \
-v default_security_group=nsg-bosh

echo "- Azure (managed-identity-for-bosh-managed-vms)"
Expand All @@ -502,7 +499,6 @@ bosh create-env bosh.yml \
-v subscription_id=test \
-v azure-managed-identity=test \
-v resource_group_name=test \
-v storage_account_name=test \
-v default_security_group=nsg-bosh

echo "- Azure (cloud-config)"
Expand Down