Skip to content

Commit

Permalink
Merge pull request #457 from Azure/feature/452
Browse files Browse the repository at this point in the history
move to CycleCloud 8.2
  • Loading branch information
xpillons authored Aug 11, 2021
2 parents da46435 + 888c33a commit 42aae6a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/configs/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cyclecloud:
publisher: "azurecyclecloud"
offer: "azure-cyclecloud"
sku: "cyclecloud-81"
version: "8.1.120210614"
version: "8.2.020210809"
plan:
name: "cyclecloud-81"
publisher: "azurecyclecloud"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/configs/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cyclecloud:
publisher: "azurecyclecloud"
offer: "azure-cyclecloud"
sku: "cyclecloud-81"
version: "8.1.120210614"
version: "8.2.020210809"
plan:
name: "cyclecloud-81"
publisher: "azurecyclecloud"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/configs/shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cyclecloud:
publisher: "azurecyclecloud"
offer: "azure-cyclecloud"
sku: "cyclecloud-81"
version: "8.1.120210614"
version: "8.2.020210809"
plan:
name: "cyclecloud-81"
publisher: "azurecyclecloud"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/configs/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cyclecloud:
publisher: "azurecyclecloud"
offer: "azure-cyclecloud"
sku: "cyclecloud-81"
version: "8.1.120210614"
version: "8.2.020210809"
plan:
name: "cyclecloud-81"
publisher: "azurecyclecloud"
Expand Down
4 changes: 2 additions & 2 deletions config.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ scheduler:
# CycleCloud VM configuration
cyclecloud:
vm_size: Standard_D2s_v3
# Azure Image Reference for CycleCloud. Default to 8.1.0 if not present
# Azure Image Reference for CycleCloud. Default to 8.2.020210809 if not present
image:
publisher: "azurecyclecloud"
offer: "azure-cyclecloud"
sku: "cyclecloud-81"
version: "8.1.120210614"
version: "8.2.020210809"
# Azure Image Plan for CycleCloud. Default to 8.1 if not present
plan:
name: "cyclecloud-81"
Expand Down
4 changes: 2 additions & 2 deletions docs/deploy/define_environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ scheduler:
# CycleCloud VM configuration
cyclecloud:
vm_size: Standard_D2s_v3
# Azure Image Reference for CycleCloud. Default to 8.1.0 if not present
# Azure Image Reference for CycleCloud. Default to 8.2.020210809 if not present
image:
publisher: "azurecyclecloud"
offer: "azure-cyclecloud"
sku: "cyclecloud-81"
version: "8.1.120210614"
version: "8.2.020210809"
# Azure Image Plan for CycleCloud. Default to 8.1 if not present
plan:
name: "cyclecloud-81"
Expand Down
2 changes: 1 addition & 1 deletion tf/ccportal.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ resource "azurerm_virtual_machine" "ccportal" {
publisher = try(local.configuration_yml["cyclecloud"].image.publisher,"azurecyclecloud")
offer = try(local.configuration_yml["cyclecloud"].image.offer, "azure-cyclecloud")
sku = try(local.configuration_yml["cyclecloud"].image.sku, "cyclecloud-81")
version = try(local.configuration_yml["cyclecloud"].image.version, "8.1.0")
version = try(local.configuration_yml["cyclecloud"].image.version, "8.2.020210809")
}

plan {
Expand Down

0 comments on commit 42aae6a

Please sign in to comment.