cem_acpt 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df61aa1c290a076e460b4c790babb19d0e0729e7d543feb96a9fb40e1589e50a
-  data.tar.gz: 800a652e59491e42f0e3fdd43db93e397956309e2b575d33e0f2c1497ebd8311
+  metadata.gz: 68da70c79c3346b5ce515014b2202746db3f2ef2395c60aa4891ea15635f7e7b
+  data.tar.gz: 0273522771cc02caac4f07e7b7c150f7ab3b7bbc4fc3b9126309819a5f607608
 SHA512:
-  metadata.gz: a4a93419e474a066291ead08cbb28222f635f218b3df394b92f8c23d2fc1d63d55b9c5e240229c86db22a7b98e0e8673a5f13c7d02bd0d3633976942cc22be08
-  data.tar.gz: 614ecdad289b17a01ffcaea724aa928372cf578a4270f641e592549a6f2d017235646fe5ab8b3274e23801755935b6d7e17cdd39072aee28cbc7692b86e5b663
+  metadata.gz: eff07c3af3f0692706e5863825bb324b6f9b1f821cebd54c0baad9b6b4ea30850d7307342188eaa9c81de6833650cb472f74b8bc378a333886117320033dfbd2
+  data.tar.gz: 5c5cf88592e47515349bde762ee85baf5f07000b024d20e6f5fa550780641049b5b9cf514ab3a74a804fbfb8685c73fd6227271a7d2ea2aa734e9abc819e26f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.11.1)
+    cem_acpt (0.11.2)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)

data/lib/cem_acpt/image_builder/provision_commands.rb

@@ -19,7 +19,11 @@ module CemAcpt
 
         def provision_commands
           commands_from_config = @config.get("images.#{@image_name}.provision_commands") || []
-          (default_provision_commands + commands_from_config).compact
+          if @config.get("images.#{@image_name}.skip_default_provision_commands")
+            commands_from_config.compact
+          else
+            (default_provision_commands + commands_from_config).compact
+          end
         end
         alias to_a provision_commands
 
@@ -83,7 +87,11 @@ module CemAcpt
 
         def provision_commands
           commands_from_config = @config.get("images.#{@image_name}.provision_commands") || []
-          (default_provision_commands + commands_from_config).compact
+          if @config.get("images.#{@image_name}.skip_default_provision_commands")
+            commands_from_config.compact
+          else
+            (default_provision_commands + commands_from_config).compact
+          end
         end
         alias to_a provision_commands
       end
@@ -103,7 +111,11 @@ module CemAcpt
 
         def provision_commands
           commands_from_config = @config.get("images.#{@image_name}.provision_commands") || []
-          (default_provision_commands + commands_from_config).compact
+          if @config.get("images.#{@image_name}.skip_default_provision_commands")
+            commands_from_config.compact
+          else
+            (default_provision_commands + commands_from_config).compact
+          end
         end
         alias to_a provision_commands
 

data/lib/cem_acpt/image_builder.rb

@@ -86,7 +86,7 @@ module CemAcpt
             output.each do |instance_name, data|
               unless @config.get('no_destroy_nodes')
                 logger.info('CemAcpt::ImageBuilder') { "Stopping instance #{instance_name}..." }
-                @exec.run('compute', 'instances', 'stop', instance_name)
+                @exec.run('compute', 'instances', 'stop', instance_name, '--zone', @config.get('platform.zone'))
               end
               unless @config.get('no_build_images')
                 deprecate_old_images_in_family(data['image_family'])

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

data/lib/terraform/gcp/linux/main.tf

@@ -189,7 +189,12 @@ resource "google_compute_instance" "acpt-test-node" {
   }
 
   metadata = {
-    "enable-oslogin" = "TRUE"
+    # Keep OSLogin disabled on test instances. The metadata "ssh-keys" entry
+    # below is what cem_acpt relies on for SSH auth (terraform's remote-exec
+    # provisioner connects with the ephemeral key generated per run). With
+    # enable-oslogin=TRUE, GCP ignores the metadata "ssh-keys" entry, and we
+    # currently have no plumbing for OSLogin key registration.
+    "enable-oslogin" = "FALSE"
     "ssh-keys"       = "${var.username}:${file(var.public_key)}"
     "cem-acpt-test"  = each.value.test_name
   }

data/lib/terraform/image/gcp/linux/main.tf

@@ -116,7 +116,14 @@ resource "google_compute_instance" "acpt-test-node" {
   }
 
   metadata = {
-    "enable-oslogin"   = "TRUE"
+    # Keep OSLogin disabled on the throwaway build instance. The metadata
+    # "ssh-keys" entry below is what terraform's remote-exec provisioner
+    # uses for SSH auth (with the ephemeral key generated per run). With
+    # enable-oslogin=TRUE, GCP ignores the metadata "ssh-keys" entry, and
+    # we have no plumbing for OSLogin key registration. The build instance
+    # is destroyed immediately after the disk is snapshotted, so disabling
+    # OSLogin here only affects the throwaway VM, not the resulting image.
+    "enable-oslogin"   = "FALSE"
     "ssh-keys"         = "${var.username}:${file(var.public_key)}"
     "for-image-family" = each.value.image_family
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - puppetlabs