cloud-mu 3.6.5 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96aa9767cfcb84a683ad7ecf2dd6da9f901e1fc453157e73ede6d68e7e2d0b3a
-  data.tar.gz: 6f8ee1d7fec65bc016ce4ff28fd3287939cb76aab504a06e017464dd2d6aeb16
+  metadata.gz: 003c0d1b66f1b8e0bf05fa41a1b8503e7d7690b115505e4537fcb85d096018e7
+  data.tar.gz: 93680350b3d1425ce72a416b31503be4d4941cb6ee9d9ac46a4ae089827ae93a
 SHA512:
-  metadata.gz: 705853948d5568bfebabfe46c258fd7de4bb89e727878f0df2abd5b668ffaf23e845def243c539838d1b16457f5f867caa263082e9b327cfb035de7bb1064b48
-  data.tar.gz: 78f848fa81ceae7c0d4f4c67fd348997f59cdddc82365c93e42bc0026a404df2d0e8011c9e5f53ca79cf68ed06e16b3598542733809d3b7a30d272e4079663bf
+  metadata.gz: 51172cf4ab24e2f910886c3940097d96f7af89d657582aa4f13f4b9b9bf9cbbf140a8fa66bfdafcf2d492edb2d299582ee6bbb2c908ae0ee60b883dafd711c67
+  data.tar.gz: c342ed932ee018391cec0e4a762b58437dde1ad87f69a1016a9b9078b27a1899ae525b0739474c702985a1c02f3ceea342ace1483863a7cda091347090d59973

data/bin/mu-aws-setup

@@ -251,7 +251,6 @@ if $opts[:optdisk] and !File.open("/etc/mtab").read.match(/ \/opt[\s\/]/)
     MU.log "Failed to retrieve UUID of block device xvdj", MU::ERR, details: MU::Cloud::AWS.realDevicePath("/dev/xvdj")
     exit 1
   end
-
   MU.log "Moving contents of /opt to /opt_tmp", MU::NOTICE
   system("/bin/mv /opt/* /opt_tmp/")
   exit 1 if $?.exitstatus != 0

data/bin/mu-configure

@@ -30,14 +30,14 @@ require 'tmpdir'
 AMROOT = Process.uid == 0
 HOMEDIR = Etc.getpwuid(Process.uid).dir
 CLEAN_ENV={
-  "PATH" => "/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/usr/local/ruby-current/bin",
+  "PATH" => "/usr/local/ruby-current/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin",
   "HOME" => HOMEDIR
 }
 CLEAN_ENV_STR = CLEAN_ENV.keys.map { |k|
   k+"=\""+CLEAN_ENV[k]+"\""
 }.join(" ")
 CHEF_CLIENT="/opt/chef/bin/chef-client"
-CHEF_CTL="/opt/opscode/bin/chef-server-ctl"
+CHEF_CTL="env -i PATH=/opt/opscode/bin:/usr/bin:/bin chef-server-ctl"
 GIT_PATTERN = /(((git|ssh|http(s)?)|(git@[\w\.]+))(:(\/\/)?))?([\w\.@\:\/\-~]+)(\.git)?(\/)?/
 
 
@@ -554,19 +554,18 @@ if !$NOOP
   end
 
 
+  _system("cd #{MU_BASE}/lib/modules && umask 0022 && bundle install")
   if AMROOT and !$IN_GEM
     Dir.chdir("/")
     if $IN_AWS
-      _system("#{MU_BASE}/lib/bin/mu-aws-setup --optdisk")
+      _system("cd #{MU_BASE}/lib/modules && bundle exec #{MU_BASE}/lib/bin/mu-aws-setup --optdisk")
     elsif $IN_GOOGLE
-      _system("#{MU_BASE}/lib/bin/mu-gcp-setup --optdisk")
+      _system("cd #{MU_BASE}/lib/modules && bundle exec #{MU_BASE}/lib/bin/mu-gcp-setup --optdisk")
     elsif $IN_AZURE
-      _system("#{MU_BASE}/lib/bin/mu-azure-setup --optdisk")
+      _system("cd #{MU_BASE}/lib/modules && bundle exec #{MU_BASE}/lib/bin/mu-azure-setup --optdisk")
     end
     exit 1 if $?.exitstatus != 0
   end
-  _system("cd #{MU_BASE}/lib/modules && umask 0022 && env -i PATH=/usr/local/ruby-current/bin:/bin:/usr/bin /usr/local/ruby-current/bin/bundle install")
-  _system("cd #{MU_BASE}/lib/modules && umask 0022 && env -i PATH=/opt/chef/embedded/bin:/bin:/usr/bin /opt/chef/embedded/bin/bundle install")
 
   KNIFE_TEMPLATE = "log_level                :info
 log_location             STDOUT

data/bin/mu-upload-chef-artifacts

@@ -20,12 +20,6 @@ set -e
 #################################################
 
 scriptpath="`dirname $0`"
-# Chef can't pick a lane
-if [ -x "/opt/chef/bin/knife" ];then
-  knife="/opt/chef/bin/knife"
-elif [ -x "/opt/chef/embedded/bin/knife" ];then
-  knife="/opt/chef/embedded/bin/knife"
-fi
 
 USER=`whoami`
 STARTDIR=`pwd`
@@ -56,6 +50,9 @@ real_datadir="$MU_DATADIR"
 
 
 source $MU_INSTALLDIR/lib/install/deprecated-bash-library.sh
+# Chef can't pick a lane
+export PATH="/usr/local/ruby-current/bin:/usr/bin:/bin"
+
 # if [ -x $MU_INSTALLDIR/lib/bin/mu-gen-env ];then
 #   $MU_INSTALLDIR/lib/bin/mu-gen-env > $HOMEDIR/.murc
 #   source $HOMEDIR/.murc
@@ -199,7 +196,7 @@ add_berkshelf_cookbooks()
     cd $repodir
     set +e
     for name in $berkshelf_cookbooks;do
-      $knife cookbook $knife_cfg delete $name --yes -a
+      knife cookbook $knife_cfg delete $name --yes -a
     done
     set -e
   fi
@@ -254,7 +251,6 @@ set_repo_path()
   fi
 }
 
-
 all=0
 while getopts "fb:c:npsgdhar:b:m:" opt; do
   case $opt in
@@ -370,24 +366,24 @@ fi
 if [ "$nopurge" == "" -a "$all" == "1" ];then
   if [ "$use_on_disk" == "1" -o "$all" == "1" ];then
     if [ "$cookbooks_only" == "1" ];then
-      $knife cookbook $knife_cfg bulk delete --purge '.+' --yes 2>/dev/null
+      knife cookbook $knife_cfg bulk delete --purge '.+' --yes 2>/dev/null
       /bin/rm -rf $MU_CHEF_CACHE/cookbooks $MU_CHEF_CACHE/site_cookbooks
     elif [ "$bags_only" == "1" ];then
       # Nowadays we have data bags that are persistent and node-related. Leave
       # them be, and only delete our automatic ones.
       for bag in nagios_users nagios_servers demo;do
-        $knife data bag $knife_cfg delete $bag --yes 2>/dev/null
+        knife data bag $knife_cfg delete $bag --yes 2>/dev/null
       done
     else
-      $knife cookbook $knife_cfg bulk delete --purge '.+' --yes 2>/dev/null
+      knife cookbook $knife_cfg bulk delete --purge '.+' --yes 2>/dev/null
       /bin/rm -rf $MU_CHEF_CACHE/cookbooks $MU_CHEF_CACHE/site_cookbooks
       /bin/rm -rf $MU_CHEF_CACHE/roles $MU_CHEF_CACHE/environments $MU_CHEF_CACHE/data_bags
-      $knife role $knife_cfg bulk delete '.*' --yes 2>/dev/null
-      for env in `$knife environment $knife_cfg list | grep -v '_default$'`;do
-        $knife environment $knife_cfg delete $env --yes 2>/dev/null
+      knife role $knife_cfg bulk delete '.*' --yes 2>/dev/null
+      for env in `knife environment $knife_cfg list | grep -v '_default$'`;do
+        knife environment $knife_cfg delete $env --yes 2>/dev/null
       done
       for bag in nagios_users nagios_servers demo;do
-        $knife data bag $knife_cfg delete $bag --yes 2>/dev/null
+        knife data bag $knife_cfg delete $bag --yes 2>/dev/null
       done
     fi
   fi
@@ -420,16 +416,16 @@ for repo in $REPOS;do
       set +e
       if [ "$type" == "cookbooks" -o "$type" == "site_cookbooks" ];then
         /bin/rm -rf $MU_CHEF_CACHE/$type/$name
-        $knife cookbook $knife_cfg delete $name --yes --all
+        knife cookbook $knife_cfg delete $name --yes --all
       elif [ "$type" == "roles" -a "$cookbooks_only" == "" ];then
         /bin/rm -rf $MU_CHEF_CACHE/$type/$name.json
-        $knife role $knife_cfg delete $name --yes
+        knife role $knife_cfg delete $name --yes
       elif [ "$type" == "environments" -a "$cookbooks_only" == "" ];then
         /bin/rm -rf $MU_CHEF_CACHE/$type/$name.json
-        $knife environment $knife_cfg delete $name --yes
+        knife environment $knife_cfg delete $name --yes
       elif [ "$type" == "data_bags" -a "$cookbooks_only" == "" ];then
         /bin/rm -rf $MU_CHEF_CACHE/$type/$name
-        $knife data bag $knife_cfg delete $name --yes
+        knife data bag $knife_cfg delete $name --yes
       fi
       set -e
     done
@@ -630,9 +626,9 @@ if [ -d "$MU_DATADIR/users" -a "$USER" == "root" ];then
     if [ -f "$bagdir/$admin.json" ];then
       if [ "$bagcreated" == "0" ];then
         bagcreated=1
-        $knife data bag $knife_cfg create nagios_users
+        knife data bag $knife_cfg create nagios_users
       fi
-      $knife data bag $knife_cfg from file nagios_users $bagdir/$admin.json
+      knife data bag $knife_cfg from file nagios_users $bagdir/$admin.json
     fi
     if [ ! -f "$bagdir/$admin.json" ];then
       id="`echo $admin | sed -e 's/@/_/'`"
@@ -666,21 +662,21 @@ if [ "$all" != "1" ];then
         if [ "$match" == "" -o "$match" == "$itemname" ];then
           if [ "$bagcreated" == "0" ];then
             bagcreated=1
-            $knife data bag $knife_cfg create $bag
+            knife data bag $knife_cfg create $bag
           fi
-          $knife data bag $knife_cfg from file $bag $file
+          knife data bag $knife_cfg from file $bag $file
         fi
       done
     done
   else
     for role in $upload_roles;do
       if [ "$match" == "" -o "$match" == "$role" ];then
-        $knife role $knife_cfg from file $MU_CHEF_CACHE/roles/$role.json
+        knife role $knife_cfg from file $MU_CHEF_CACHE/roles/$role.json
       fi
     done
     for env in $upload_environments;do
       if [ "$match" == "" -o "$match" == "$env" ];then
-        $knife environment $knife_cfg from file $MU_CHEF_CACHE/environments/$env.json
+        knife environment $knife_cfg from file $MU_CHEF_CACHE/environments/$env.json
       fi
     done
     set +e
@@ -691,9 +687,9 @@ if [ "$all" != "1" ];then
         if [ "$match" == "" -o "$match" == "$itemname" ];then
           if [ "$bagcreated" == "0" ];then
             bagcreated=1
-            $knife data bag $knife_cfg create $bag
+            knife data bag $knife_cfg create $bag
           fi
-          $knife data bag $knife_cfg from file $bag $file
+          knife data bag $knife_cfg from file $bag $file
         fi
       done
     done
@@ -722,9 +718,9 @@ else
         if [ "$match" == "" -o "$match" == "$itemname" ];then
           if [ "$bagcreated" == "0" ];then
             bagcreated=1
-            $knife data bag $knife_cfg create $folder
+            knife data bag $knife_cfg create $folder
           fi
-          $knife data bag $knife_cfg from file $folder $file
+          knife data bag $knife_cfg from file $folder $file
         fi
       done
     done
@@ -738,7 +734,7 @@ else
     for file in $_files;do
       role="`echo $file | sed -r 's/.*\/([^\\]+).json$/\1/'`"
       if [ "$match" == "" -o "$match" == "$role" ];then
-        $knife role $knife_cfg from file $file
+        knife role $knife_cfg from file $file
       fi
     done
     
@@ -746,7 +742,7 @@ else
     for file in $_files;do
       env="`echo $file | sed -r 's/.*\/([^\\]+).json$/\1/'`"
       if [ "$match" == "" -o "$match" == "$env" ];then
-        $knife environment $knife_cfg from file $file
+        knife environment $knife_cfg from file $file
       fi
     done
     
@@ -760,9 +756,9 @@ else
         if [ "$match" == "" -o "$match" == "$itemname" ];then
           if [ "$bagcreated" == "0" ];then
             bagcreated=1
-            $knife data bag $knife_cfg create $folder
+            knife data bag $knife_cfg create $folder
           fi
-          $knife data bag $knife_cfg from file $folder $file
+          knife data bag $knife_cfg from file $folder $file
         fi
       done
       set -e

data/cloud-mu.gemspec

@@ -17,8 +17,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '3.6.5'
-  s.date        = '2024-11-27'
+  s.version     = '3.6.7'
+  s.date        = '2024-11-28'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 3.3'
   s.summary     = "The eGTLabs Mu toolkit for unified cloud deployments"
@@ -41,8 +41,10 @@ EOF
 
   # We have to pin the AWS SDK to whatever version Chef bundles otherwise it
   # loses its entire mind during dependency resolution
-  s.add_runtime_dependency "aws-sdk-core", "~> 3.171.0"
-  s.add_runtime_dependency "aws-sdk"
+  if whereami !~ /^\/opt\/chef\/embedded\//
+    s.add_runtime_dependency "aws-sdk-core", "~> 3.214.0"
+    s.add_runtime_dependency "aws-sdk", "~> 3.2"
+  end
 
 #  s.add_runtime_dependency 'azure_sdk', '~> 0.65'
   s.add_runtime_dependency 'bundler'#, "~> 2.2"

data/cookbooks/mu-master/recipes/init.rb

@@ -23,6 +23,9 @@
 # templates.
 
 chef_gem "aws-sigv4"
+chef_gem "cloud-mu" do
+  compile_time true
+end
 
 require 'etc'
 require 'open-uri'
@@ -40,6 +43,7 @@ ENV['PATH'] = ENV['PATH']+":/bin:/opt/opscode/embedded/bin"
 CHEF_SERVER_VERSION="14.11.31-1"
 CHEF_CLIENT_VERSION="18.5.0"
 KNIFE_WINDOWS="1.9.0"
+KNIFE="env -i HOME=/root PATH=/usr/local/ruby-current/bin:/bin:/usr/bin knife" # it's separate from Chef now, we get it as a gem
 MU_BASE="/opt/mu"
 
 MU_BRANCH = if ENV.key?('MU_BRANCH')
@@ -71,6 +75,7 @@ else
     ignore_failure true # the service restart often fails to leave sshd alive
   end
 end
+
 RUNNING_STANDALONE=node['application_attributes'].nil?
 
 service "iptables" do
@@ -287,7 +292,7 @@ bash "set git default branch to #{MU_BRANCH}" do
   action :nothing
 end
 git "#{MU_BASE}/lib" do
-  repository "git://github.com/cloudamatic/mu.git"
+  repository "https://github.com/cloudamatic/mu.git"
   revision MU_BRANCH
   checkout_branch MU_BRANCH
   enable_checkout false
@@ -537,7 +542,7 @@ else
   "#{MU_BASE}/lib/modules"
 end
 
-rubies = ["/usr/local/ruby-current", "/opt/chef/embedded"]
+rubies = ["/usr/local/ruby-current"]
 
 rubies.each { |rubydir|
   gembin = rubydir+"/bin/gem"
@@ -559,7 +564,7 @@ rubies.each { |rubydir|
       action :upgrade
       ignore_failure true
     end
-    version "~> 2.1.4"
+    version "~> 2.5.23"
     notifies :run, "bash[fix #{rubydir} gem permissions]", :delayed
   end
   execute "#{bundler_path} install from #{gemfile_dir} for #{rubydir}" do
@@ -594,25 +599,26 @@ rubies.each { |rubydir|
 
 # This is mostly to make sure Berkshelf has a clean and current environment to
 # live with.
-execute "/usr/local/ruby-current/bin/bundle clean --force" do
+execute "env -i PATH=/usr/local/ruby-current/bin:/bin:/usr/bin bundle clean --force" do
   cwd gemfile_dir
   only_if { RUNNING_STANDALONE }
 end
 
 # Get a 'mu' Chef org in place and populate it with artifacts
 directory "/root/.chef"
-execute "env -i HOME=/root:PATH=/opt/chef/embedded/bin:/bin:/usr/bin /opt/chef/embedded/bin/knife ssl fetch" do
-  action :nothing
+execute "knife ssl fetch" do
+  command "#{KNIFE} ssl fetch"
+  not_if "#{KNIFE} ssl check"
 end
 execute "initial Chef artifact upload" do
   command "MU_INSTALLDIR=#{MU_BASE} MU_LIBDIR=#{MU_BASE}/lib MU_DATADIR=#{MU_BASE}/var #{MU_BASE}/lib/bin/mu-upload-chef-artifacts"
-  action :nothing
+#  action :nothing
   notifies :stop, "service[iptables]", :before
-  notifies :run, "execute[env -i knife ssl fetch]", :before
   if !RUNNING_STANDALONE
     notifies :start, "service[iptables]", :immediately
   end
   only_if { RUNNING_STANDALONE }
+  not_if "#{KNIFE} cookbook show mu-master"
 end
 chef_gem "simple-password-gen" do
   compile_time true
@@ -710,15 +716,21 @@ end
 
 knife_cfg = "-c /root/.chef/knife.rb"
 
+execute "reinit MU-MASTER Chef client" do
+  command "#{KNIFE} node delete MU-MASTER ; #{KNIFE} client delete MU-MASTER"
+  not_if { File.exists?("/etc/chef/validation.pem") }
+  only_if "#{KNIFE} node #{knife_cfg} list | grep '^MU-MASTER$'"
+end
+
 execute "create MU-MASTER Chef client" do
 # XXX I dislike --ssh-verify-host-key=never intensely, but the CLI-documented 'accept_new' doesn't actually work
   if SSH_USER == "root"
-    command "PATH='/opt/chef/bin:/opt/chef/embedded/bin' knife bootstrap #{knife_cfg} -N MU-MASTER --no-node-verify-api-cert --node-ssl-verify-mode=none -U #{SSH_USER} --ssh-identity-file=/root/.ssh/id_rsa --ssh-verify-host-key=never 127.0.0.1"
+    command "#{KNIFE} bootstrap #{knife_cfg} -N MU-MASTER --no-node-verify-api-cert --node-ssl-verify-mode=none -U #{SSH_USER} --ssh-identity-file=/root/.ssh/id_rsa --ssh-verify-host-key=never 127.0.0.1"
   else
-    command "PATH='/opt/chef/bin:/opt/chef/embedded/bin' knife bootstrap #{knife_cfg} -N MU-MASTER --no-node-verify-api-cert --node-ssl-verify-mode=none -U #{SSH_USER} --ssh-identity-file=/root/.ssh/id_rsa --ssh-verify-host-key=never --sudo 127.0.0.1"
+    command "#{KNIFE} bootstrap #{knife_cfg} -N MU-MASTER --no-node-verify-api-cert --node-ssl-verify-mode=none -U #{SSH_USER} --ssh-identity-file=/root/.ssh/id_rsa --ssh-verify-host-key=never --sudo 127.0.0.1"
   end
-  only_if "PATH='/opt/chef/bin:/opt/chef/embedded/bin' knife node #{knife_cfg} list" # don't do crazy stuff just because knife isn't working
-  not_if "PATH='/opt/chef/bin:/opt/chef/embedded/bin' knife node #{knife_cfg} list | grep '^MU-MASTER$'"
+  only_if "#{KNIFE} node #{knife_cfg} list" # don't do crazy stuff just because knife isn't working
+  not_if "#{KNIFE} node #{knife_cfg} list | grep '^MU-MASTER$'"
   notifies :run, "execute[add localhost key to authorized_keys]", :before
   notifies :delete, "file[/etc/chef/client.rb]", :before
   notifies :delete, "file[/etc/chef/client.pem]", :before

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.7
 platform: ruby
 authors:
 - John Stange
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -33,28 +33,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.171.0
+        version: 3.214.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.171.0
+        version: 3.214.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -446,6 +446,9 @@ description: |+
 
 email: eGTLabs@eglobaltech.com
 executables:
+- mu-adopt
+- mu-ansible-secret
+- mu-aws-setup
 - mu-azure-setup
 - mu-azure-tests
 - mu-cleanup
@@ -463,12 +466,9 @@ executables:
 - mu-self-update
 - mu-ssh
 - mu-tunnel-nagios
-- mu-upload-chef-artifacts
 - mu-user-manage
-- mu-adopt
-- mu-ansible-secret
-- mu-aws-setup
 - mu-configure
+- mu-upload-chef-artifacts
 extensions: []
 extra_rdoc_files: []
 files:
@@ -1339,7 +1339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The eGTLabs Mu toolkit for unified cloud deployments