Externalizing the disk configuration for OM as default is 30 GB and n… (

#187) * Externalizing the disk configuration for OM as default is 30 GB and now from params you can specify the OM disk size. We were running into issues with upgrades, where the disk was full on OM * Adding the om_disk_size_in_gb to the variables.tf file * Fixing the bug where it ops director public/private key was using the wrong variables * Fixing the IAAS_TYPE for azure stemcell download
vmware-archive · Oct 31, 2017 · 4da878c · 4da878c
1 parent bcad374
commit 4da878c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 4 deletions.
diff --git a/install-pcf/azure/params.yml b/install-pcf/azure/params.yml
@@ -99,6 +99,7 @@ azure_terraform_subnet_services1_dns: "168.63.129.16,8.8.8.8"
 azure_terraform_subnet_services1_gateway: "192.168.8.1"
 azure_terraform_subnet_services1_reserved: "192.168.8.1-192.168.8.9"
 azure_terraform_vnet_cidr: "192.168.0.0/20"
+pcf_opsman_disk_size_in_gb: 120
 
 container_networking_nw_cidr: 10.255.0.0/16 # c2c networking network cidr
 

diff --git a/install-pcf/azure/pipeline.yml b/install-pcf/azure/pipeline.yml
@@ -186,6 +186,7 @@ jobs:
       AZURE_TERRAFORM_SUBNET_ERT_CIDR: {{azure_terraform_subnet_ert_cidr}}
       AZURE_TERRAFORM_SUBNET_SERVICES1_CIDR: {{azure_terraform_subnet_services1_cidr}}
       AZURE_TERRAFORM_SUBNET_DYNAMIC_SERVICES_CIDR: {{azure_terraform_subnet_dynamic_services_cidr}}
+      PCF_OPSMAN_DISK_SIZE_IN_GB: {{pcf_opsman_disk_size_in_gb}}
 
 ##############################
 ## Job - Config OpsMan Auth ##

diff --git a/install-pcf/azure/tasks/create-infrastructure/task.sh b/install-pcf/azure/tasks/create-infrastructure/task.sh
@@ -73,6 +73,7 @@ terraform plan \
   -var "azure_droplets_container=${AZURE_DROPLETS_CONTAINER}" \
   -var "azure_packages_container=${AZURE_PACKAGES_CONTAINER}" \
   -var "azure_resources_container=${AZURE_RESOURCES_CONTAINER}" \
+  -var "om_disk_size_in_gb=${PCF_OPSMAN_DISK_SIZE_IN_GB}" \
   -out terraform.tfplan \
   -state terraform-state/terraform.tfstate \
   "pcf-pipelines/install-pcf/azure/terraform/${AZURE_PCF_TERRAFORM_TEMPLATE}"

diff --git a/install-pcf/azure/tasks/create-infrastructure/task.yml b/install-pcf/azure/tasks/create-infrastructure/task.yml
@@ -43,3 +43,4 @@ params:
   AZURE_TERRAFORM_SUBNET_ERT_CIDR:
   AZURE_TERRAFORM_SUBNET_SERVICES1_CIDR:
   AZURE_TERRAFORM_SUBNET_DYNAMIC_SERVICES_CIDR:
+  PCF_OPSMAN_DISK_SIZE_IN_GB:
diff --git a/install-pcf/azure/tasks/iaas/config-director.sh b/install-pcf/azure/tasks/iaas/config-director.sh
@@ -18,8 +18,8 @@ iaas_configuration=$(
     --arg bosh_storage_account_name "${ENV_SHORT_NAME}root" \
     --arg deployments_storage_account_name "*boshvms*" \
     --arg default_security_group "pcf-default-security-group" \
-    --arg ssh_private_key "${PCF_SSH_KEY_PRIV}" \
     --arg ssh_public_key "${PCF_SSH_KEY_PUB}" \
+    --arg ssh_private_key "${PCF_SSH_KEY_PRIV}" \
     --arg cloud_storage_type "managed_disks" \
     --arg storage_account_type "Premium_LRS" \
     --arg environment "AzureCloud" \

diff --git a/install-pcf/azure/terraform/c0-azure-base/ops_manager.tf b/install-pcf/azure/terraform/c0-azure-base/ops_manager.tf
@@ -32,6 +32,7 @@ resource "azurerm_virtual_machine" "ops_manager_vm" {
     caching       = "ReadWrite"
     os_type       = "linux"
     create_option = "FromImage"
+    disk_size_gb  = "${var.om_disk_size_in_gb}"
   }
 
   os_profile {

diff --git a/install-pcf/azure/terraform/c0-azure-base/variables.tf b/install-pcf/azure/terraform/c0-azure-base/variables.tf
@@ -33,3 +33,4 @@ variable "azure_buildpacks_container" {}
 variable "azure_droplets_container" {}
 variable "azure_packages_container" {}
 variable "azure_resources_container" {}
+variable "om_disk_size_in_gb" {}
diff --git a/install-pcf/azure/terraform/c0-azure-multi-res-group/ops_manager.tf b/install-pcf/azure/terraform/c0-azure-multi-res-group/ops_manager.tf
@@ -32,6 +32,7 @@ resource "azurerm_virtual_machine" "ops_manager_vm" {
     caching       = "ReadWrite"
     os_type       = "linux"
     create_option = "FromImage"
+    disk_size_gb  = "${var.om_disk_size_in_gb}"
   }
 
   os_profile {

diff --git a/install-pcf/azure/terraform/c0-azure-multi-res-group/variables.tf b/install-pcf/azure/terraform/c0-azure-multi-res-group/variables.tf
@@ -45,3 +45,4 @@ variable "vm_admin_public_key" {}
 variable "ert_subnet_id" {}
 variable "azure_multi_resgroup_network" {}
 variable "azure_multi_resgroup_pcf" {}
+variable "om_disk_size_in_gb" {}
diff --git a/upgrade-ops-manager/azure/pipeline.yml b/upgrade-ops-manager/azure/pipeline.yml
@@ -90,11 +90,11 @@ jobs:
     file: pcf-pipelines/upgrade-ops-manager/azure/tasks/create-cliaas-config/task.yml
     params:
         AZURE_REGION: {{azure_region}}
-        AZURE_SUBSCRIPTION_ID: {{azure_subscription_id}} 
+        AZURE_SUBSCRIPTION_ID: {{azure_subscription_id}}
         AZURE_CLIENT_ID: {{azure_client_id}}
         AZURE_CLIENT_SECRET: {{azure_client_secret}}
-        AZURE_TENANT_ID: {{azure_tenant_id}} 
-        AZURE_RESOURCE_GROUP_NAME: {{azure_resource_group_name}} 
+        AZURE_TENANT_ID: {{azure_tenant_id}}
+        AZURE_RESOURCE_GROUP_NAME: {{azure_resource_group_name}}
         AZURE_STORAGE_ACCOUNT_NAME: {{azure_storage_account_name}}
         AZURE_STORAGE_ACCOUNT_KEY: {{azure_storage_account_key}}
         AZURE_STORAGE_CONTAINER_NAME: {{azure_storage_container_name}}