Allow the GCP VM type to optionally be configured

Author: ystros

lib/packer/config/gcp.rb

@@ -16,6 +16,7 @@ def initialize(
         root_disk_size: 32,
         omit_external_ip: false,
         vm_tags: ['winrm'],
+        vm_type:,
         network: nil,
         network_project_id: nil,
         subnetwork: nil)
@@ -31,6 +32,7 @@ def initialize(
         @root_disk_size = root_disk_size
         @omit_external_ip = omit_external_ip
         @vm_tags = vm_tags
+        @vm_type = vm_type
         @network = network
         @network_project_id = network_project_id
         @subnetwork = subnetwork
@@ -48,7 +50,7 @@ def builders
             'zone' => 'us-west1-c',
             'disk_size' => @root_disk_size,
             'image_name' => "packer-#{Time.now.to_i}",
-            'machine_type' => 'n1-standard-4',
+            'machine_type' => @vm_type,
             'network' => @network,
             'network_project_id' => @network_project_id,
             'subnetwork' => @subnetwork,

lib/stemcell/builder/gcp.rb

@@ -7,6 +7,7 @@ def initialize(account_json:,
                      source_image:,
                      image_family:,
                      vm_prefix:,
+                     vm_type:,
                      network:,
                      network_project_id:,
                      subnetwork:,
@@ -16,6 +17,7 @@ def initialize(account_json:,
         @source_image = source_image
         @image_family = image_family
         @vm_prefix = vm_prefix
+        @vm_type = vm_type
         @network = network
         @network_project_id = network_project_id
         @subnetwork = subnetwork
@@ -49,6 +51,7 @@ def packer_config
           os: @os,
           version: @version,
           vm_prefix: @vm_prefix,
+          vm_type: @vm_type,
           mount_ephemeral_disk: @mount_ephemeral_disk
         ).dump
       end

lib/tasks/build/gcp.rake

@@ -36,6 +36,7 @@ namespace :build do
       image_family: image_family,
       version: version,
       vm_prefix: ENV.fetch('VM_PREFIX', ''),
+      vm_type: ENV.fetch('GCP_VM_TYPE', 'n1-standard-4'),
       mount_ephemeral_disk: ENV.fetch('MOUNT_EPHEMERAL_DISK', 'false')
     )
 

spec/packer/config/gcp_spec.rb

@@ -19,6 +19,7 @@
         os: os,
         version: '',
         vm_prefix: 'some-vm-prefix',
+        vm_type: 'some-vm-type',
     ).builders }
 
     let (:baseline_builders) { {
@@ -30,7 +31,7 @@
             'image_family' => 'some-image-family',
             'zone' => 'us-west1-c',
             'disk_size' => 32,
-            'machine_type' => 'n1-standard-4',
+            'machine_type' => 'some-vm-type',
             'omit_external_ip' => false,
             'communicator' => 'winrm',
             'winrm_username' => 'winrmuser',
@@ -64,6 +65,7 @@
           os: '',
           version: '',
           vm_prefix: '',
+          vm_type: '',
         ).builders
         expect(builders[0]['metadata']).to include(
           'name' => "packer-#{Time.now.to_i}"
@@ -95,7 +97,8 @@
           image_family: '',
           os: 'windows2019',
           version: version,
-          vm_prefix: ''
+          vm_prefix: '',
+          vm_type: '',
         ).provisioners
         expected_provisioners_base = [
           {"type" => "file", "source" => "build/bosh-psmodules.zip", "destination" => "C:\\provision\\bosh-psmodules.zip", "pause_before"=>"60s"},

spec/stemcell/builder/gcp_spec.rb

@@ -27,6 +27,7 @@
         source_image = "some-source-image"
         image_family= "some-family"
         vm_prefix = "some-vm-prefix"
+        vm_type = "some-vm-type"
         network = 'default'
         network_project_id = 'project-id'
         subnetwork = 'subnet'
@@ -42,6 +43,7 @@
           os: os,
           version: version,
           vm_prefix: vm_prefix,
+          vm_type: vm_type,
           mount_ephemeral_disk: false,
           network: network,
           network_project_id: network_project_id,
@@ -77,6 +79,7 @@
           source_image: source_image,
           image_family: image_family,
           vm_prefix: vm_prefix,
+          vm_type: vm_type,
           mount_ephemeral_disk: "false",
           network: network,
           network_project_id: network_project_id,
@@ -94,6 +97,7 @@
           packer_vars = 'some-packer-vars'
           os = 'windows2019'
           vm_prefix = 'some-vm-prefix'
+          vm_type = 'some-vm-type'
           network = 'default'
           network_project_id = 'project-id'
           subnetwork = 'subnet'
@@ -109,6 +113,7 @@
             os: os,
             version: '',
             vm_prefix: vm_prefix,
+            vm_type: vm_type,
             mount_ephemeral_disk: false,
             network: network,
             network_project_id: network_project_id,
@@ -131,7 +136,8 @@
               account_json: account_json,
               source_image: source_image,
               image_family: image_family,
-              vm_prefix: vm_prefix
+              vm_prefix: vm_prefix,
+              vm_type: vm_type,
             ).build
           }.to raise_error(Stemcell::Builder::PackerFailure)
         end