Commit 1291449c authored by John Northrup's avatar John Northrup

Merge branch 'gitlab-scaleup' into 'master'

machines that were scaled up to handle load and imports

See merge request !388
parents 4f42c125 dd454771
......@@ -451,7 +451,7 @@ module "virtual-machines-api" {
count = 20
environment = "${var.environment}"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
instance_type = "Standard_A8m_v2"
instance_type = "Standard_DS14"
location = "${var.location}"
resource_group_name = "${module.subnet-api.resource_group_name}"
source = "../../modules/virtual-machines/api"
......@@ -495,7 +495,7 @@ module "virtual-machines-sidekiq" {
sidekiq_asap_count = 5
sidekiq_asap_instance_type = "Standard_D3_v2"
sidekiq_besteffort_count = 3
sidekiq_besteffort_instance_type = "Standard_A4_v2"
sidekiq_besteffort_instance_type = "Standard_D8_v3"
sidekiq_elasticsearch_count = 0
sidekiq_elasticsearch_instance_type = "Standard_A4_v2"
sidekiq_pages_count = 6
......
......@@ -61,7 +61,7 @@ resource "azurerm_virtual_machine" "performance-gitlab-net" {
resource_group_name = "${var.resource_group_name}"
availability_set_id = "${azurerm_availability_set.MonitoringProd.id}"
network_interface_ids = ["${azurerm_network_interface.performance-gitlab-net-nic.id}"]
vm_size = "Standard_DS3_v2"
vm_size = "Standard_DS13_v2"
delete_os_disk_on_termination = true
storage_image_reference {
......
......@@ -62,7 +62,7 @@ resource "azurerm_virtual_machine" "prometheus" {
location = "${var.location}"
resource_group_name = "${var.resource_group_name}"
network_interface_ids = ["${azurerm_network_interface.prometheus.*.id[count.index]}"]
vm_size = "Standard_DS4_v2"
vm_size = "Standard_DS13_v2"
delete_os_disk_on_termination = true
storage_image_reference {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment