cem_acpt 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313e47c31c497b2022080f8b1c4a7c523c2e10db9b946452499bf0fa7801ad79
-  data.tar.gz: 38b9253363b2d7a100eb54b71c35175c815f054b0453197a062621b3e4624130
+  metadata.gz: 2efdc497a91addf155de008bebfc7062fa1bac0336be8c932dfe660a6f9a2322
+  data.tar.gz: 7bcb94758bd21aa8f826405a6620d42529b621f4194bb2ed1ca067c159dfeefa
 SHA512:
-  metadata.gz: 303411412161fcfc92aedb00437bf970cf866ee836e2e43fd49f63678a0af33ef1cdb6cf672ce794a2c59d51cb021cd844b25f5b53e9690d547493d06a96ca8f
-  data.tar.gz: 30b852282a238035d6a2984382c188e3e25d0c5bd71be012fffa25d36d3f1b1194b31b529ad05219ba92c2a2ef3fa583bd618e18d6c043bfc4e57b74fe4c0d5a
+  metadata.gz: 7c4c6c1f60167444e9f7b2735c6f12fb4258fa2c37b4d2552d5e4d2a3a1d25d555aa38a15592c22a9784fa7430789bb18796f50185e60248bdd7c48227be49d2
+  data.tar.gz: '09a2205577b3f8542dac2f849f769512978b64b044a97c2ec8a731e46171be0116f86e3b4857bc78f6e30f381a7fe7a2256991856b33d225f121e6bf95f09bb8'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.10.2)
+    cem_acpt (0.10.3)
       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

@@ -26,11 +26,11 @@ module CemAcpt
         private
 
         def package_manager
-          @package_manager ||= @os_major_version.to_i >= 8 ? 'dnf' : 'yum'
+          @package_manager ||= (@os_major_version.to_i >= 8) ? 'dnf' : 'yum'
         end
 
         def package_manager_utils
-          @package_manager_utils ||= @os_major_version.to_i >= 8 ? 'dnf-utils' : 'yum-utils'
+          @package_manager_utils ||= (@os_major_version.to_i >= 8) ? 'dnf-utils' : 'yum-utils'
         end
 
         def upgrade_packages_command
@@ -96,7 +96,12 @@ module CemAcpt
         private
 
         def upgrade_packages_command
-          'sudo apt-get update && sudo apt-get upgrade -y'
+          if @os_major_version.to_i > 2004
+            'sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 NEEDRESTART_MODE=a apt-get update &&'\
+            ' sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 NEEDRESTART_MODE=a apt-get upgrade -y'
+          else
+            'sudo apt-get update && sudo apt-get upgrade -y'
+          end
         end
 
         def puppet_platform_repository_url
@@ -108,7 +113,11 @@ module CemAcpt
         end
 
         def install_puppet_agent_command
-          'sudo apt-get install -y puppet-agent'
+          if @os_major_version.to_i > 2004
+            'sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 NEEDRESTART_MODE=a apt-get install -y puppet-agent'
+          else
+            'sudo apt-get install -y puppet-agent'
+          end
         end
 
         # The latest Google-provided Ubuntu images do not have curl installed by default

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http