cloud-mu 2.0.4 → 2.1.0beta

data/modules/mu/groomers/chef.rb

@@ -20,11 +20,6 @@ module MU
     # Support for Chef as a host configuration management layer.
     class Chef
 
-      # Wrapper class for temporary Exceptions. Gives our internals something
-      # to inherit that will log a notice message appropriately before
-      # bubbling up.
-      class MuNoSuchSecret < StandardError;end
-
       Object.class_eval {
         def self.const_missing(symbol)
           if symbol.to_sym == :Chef or symbol.to_sym == :ChefVault

data/modules/mu/mommacat.rb

@@ -1058,7 +1058,8 @@ module MU
         allow_multi: false,
         calling_deploy: MU.mommacat,
         flags: {},
-        dummy_ok: false
+        dummy_ok: false,
+        debug: false
     )
       return nil if cloud == "CloudFormation" and !cloud_id.nil?
       begin
@@ -1094,7 +1095,9 @@ module MU
             deploy_id = mu_name.sub(/^(\w+-\w+-\d{10}-[A-Z]{2})-/, '\1')
           end
         end
-        MU.log "Called findStray with cloud: #{cloud}, type: #{type}, deploy_id: #{deploy_id}, calling_deploy: #{calling_deploy.deploy_id if !calling_deploy.nil?}, name: #{name}, cloud_id: #{cloud_id}, tag_key: #{tag_key}, tag_value: #{tag_value}, credentials: #{credentials}", MU::DEBUG, details: flags
+        loglevel = debug ? MU::NOTICE : MU::DEBUG
+
+        MU.log "findStray(cloud: #{cloud}, type: #{type}, deploy_id: #{deploy_id}, calling_deploy: #{calling_deploy.deploy_id if !calling_deploy.nil?}, name: #{name}, cloud_id: #{cloud_id}, tag_key: #{tag_key}, tag_value: #{tag_value}, credentials: #{credentials})", loglevel, details: flags
 
         # See if the thing we're looking for is a member of the deploy that's
         # asking after it.
@@ -1110,16 +1113,19 @@ module MU
           mu_descs = MU::MommaCat.getResourceMetadata(cfg_plural, name: name, deploy_id: deploy_id, mu_name: mu_name)
 
           mu_descs.each_pair { |deploy_id, matches|
+            MU.log "findStray: #{deploy_id} had #{matches.size.to_s} initial matches", loglevel
             next if matches.nil? or matches.size == 0
             momma = MU::MommaCat.getLitter(deploy_id)
             straykitten = nil
 
+
             # If we found exactly one match in this deploy, use its metadata to
             # guess at resource names we weren't told.
             if matches.size == 1 and name.nil? and mu_name.nil?
               if cloud_id.nil?
                 straykitten = momma.findLitterMate(type: type, name: matches.first["name"], cloud_id: matches.first["cloud_id"], credentials: credentials)
               else
+                MU.log "findStray: attempting to narrow down with cloud_id #{cloud_id}", loglevel
                 straykitten = momma.findLitterMate(type: type, name: matches.first["name"], cloud_id: cloud_id, credentials: credentials)
               end
 #            elsif !flags.nil? and !flags.empty? # XXX eh, maybe later
@@ -1141,6 +1147,11 @@ module MU
 
             next if straykitten.nil?
 
+            if straykitten.cloud_id.nil?
+              MU.log "findStray: kitten #{straykitten.mu_name} came back with nil cloud_id", MU::WARN
+              next
+            end
+
             kittens[straykitten.cloud_id] = straykitten
 
             # Peace out if we found the exact resource we want
@@ -1154,6 +1165,7 @@ module MU
             end
           }
 
+
 #          if !mu_descs.nil? and mu_descs.size > 0 and !deploy_id.nil? and !deploy_id.empty? and !mu_descs.first.empty?
 #             MU.log "I found descriptions that might match #{resourceclass.cfg_plural} name: #{name}, deploy_id: #{deploy_id}, mu_name: #{mu_name}, but couldn't isolate my target kitten", MU::WARN, details: caller
 #         puts File.read(deploy_dir(deploy_id)+"/deployment.json")
@@ -1171,7 +1183,9 @@ module MU
 
         matches = []
 
+        found_the_thing = false
         credlist.each { |creds|
+          break if found_the_thing
           if cloud_id or (tag_key and tag_value) or !flags.empty?
             regions = []
             begin
@@ -1193,6 +1207,7 @@ module MU
               cloud_descs[r] = resourceclass.find(cloud_id: cloud_id, region: r, tag_key: tag_key, tag_value: tag_value, flags: flags, credentials: creds)
               # Stop if you found the thing
               if cloud_id and cloud_descs[r] and !cloud_descs[r].empty?
+                found_the_thing = true
                 break
               end
             }
@@ -1210,7 +1225,7 @@ module MU
                   # Give it a fake name if we have to and have decided that's ok.
                   if (name.nil? or name.empty?)
                     if !dummy_ok
-                      MU.log "Found cloud provider data for #{cloud} #{type} #{kitten_cloud_id}, but without a name I can't manufacture a proper #{type} object to return", MU::DEBUG, details: caller
+                      MU.log "Found cloud provider data for #{cloud} #{type} #{kitten_cloud_id}, but without a name I can't manufacture a proper #{type} object to return", loglevel, details: caller
                       next
                     else
                       if !mu_name.nil?

data/modules/scratchpad.erb

@@ -1 +1 @@
-modules/html.erb
+html.erb

data/requirements.txt

@@ -0,0 +1,5 @@
+# Modules we would like installed to our bundled Python (the RPM "muthon").
+ansible>=2.7
+awscli
+gcloud
+azure-cli

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0beta
 platform: ruby
 authors:
 - John Stange
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -202,14 +202,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -353,21 +353,22 @@ description: |+
 
 email: eGTLabs@eglobaltech.com
 executables:
-- mu-upload-chef-artifacts
-- mu-configure
 - mu-gen-docs
+- mu-node-manage
+- mu-ssh
+- mu-gen-env
+- mu-configure
 - mu-gcp-setup
 - mu-tunnel-nagios
 - mu-deploy
-- mu-firewall-allow-clients
-- mu-self-update
-- mu-user-manage
 - mu-load-config.rb
-- mu-node-manage
-- mu-ssh
-- mu-cleanup
-- mu-gen-env
+- mu-ansible-secret
 - mu-aws-setup
+- mu-upload-chef-artifacts
+- mu-user-manage
+- mu-cleanup
+- mu-firewall-allow-clients
+- mu-self-update
 extensions: []
 extra_rdoc_files: []
 files:
@@ -375,6 +376,21 @@ files:
 - Jenkinsfile
 - LICENSE.md
 - README.md
+- ansible/roles/geerlingguy.firewall/LICENSE
+- ansible/roles/geerlingguy.firewall/README.md
+- ansible/roles/geerlingguy.firewall/defaults/main.yml
+- ansible/roles/geerlingguy.firewall/handlers/main.yml
+- ansible/roles/geerlingguy.firewall/meta/main.yml
+- ansible/roles/geerlingguy.firewall/molecule/default/molecule.yml
+- ansible/roles/geerlingguy.firewall/molecule/default/playbook.yml
+- ansible/roles/geerlingguy.firewall/molecule/default/tests/test_default.py
+- ansible/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml
+- ansible/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
+- ansible/roles/geerlingguy.firewall/tasks/main.yml
+- ansible/roles/geerlingguy.firewall/templates/firewall.bash.j2
+- ansible/roles/geerlingguy.firewall/templates/firewall.init.j2
+- ansible/roles/geerlingguy.firewall/templates/firewall.unit.j2
+- bin/mu-ansible-secret
 - bin/mu-aws-setup
 - bin/mu-cleanup
 - bin/mu-configure
@@ -718,6 +734,7 @@ files:
 - cookbooks/mu-tools/templates/default/etc_pamd_system-auth.erb
 - cookbooks/mu-tools/templates/default/etc_sysconfig_network.erb
 - cookbooks/mu-tools/templates/default/kubeconfig.erb
+- cookbooks/mu-tools/templates/default/kubelet-config.json.erb
 - cookbooks/mu-tools/templates/default/kubelet.service.erb
 - cookbooks/mu-tools/templates/default/maldet_scanall.sh.erb
 - cookbooks/mu-tools/templates/default/nrpe.cfg.erb
@@ -858,7 +875,10 @@ files:
 - extras/image-generators/aws/windows.yaml
 - extras/image-generators/gcp/centos6.yaml
 - extras/lambda_waf_domain_blacklist.py
+- extras/list-stock-amis
 - extras/platform_berksfile_base
+- extras/python_rpm/build.sh
+- extras/python_rpm/muthon.spec
 - extras/ruby_rpm/build.sh
 - extras/ruby_rpm/muby.spec
 - extras/vault_tools/README.md
@@ -985,6 +1005,7 @@ files:
 - modules/mu/deploy.rb
 - modules/mu/groomer.rb
 - modules/mu/groomers/README.md
+- modules/mu/groomers/ansible.rb
 - modules/mu/groomers/chef.rb
 - modules/mu/logger.rb
 - modules/mu/master.rb
@@ -995,6 +1016,7 @@ files:
 - modules/scratchpad.erb
 - modules/tests/super_complex_bok.yml
 - modules/tests/super_simple_bok.yml
+- requirements.txt
 - roles/demo-dbservice-configure.json
 - roles/demo-portal-configure.json
 - roles/mu-master-jenkins.json
@@ -1058,11 +1080,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: The eGTLabs Mu toolkit for unified cloud deployments