cloud-mu 3.3.0 → 3.5.1

data/modules/mu/cloud/machine_images.rb

@@ -94,7 +94,7 @@ module MU
           else
             begin
               Timeout.timeout(2) do
-                response = open("#{base_url}/#{cloud}.yaml").read
+                response = URI.open("#{base_url}/#{cloud}.yaml").read
                 images ||= {}
                 images.deep_merge!(YAML.load(response))
                 break

data/modules/mu/cloud/providers.rb

@@ -64,7 +64,12 @@ module MU
     # code for each of its supported resource type classes.
     failed = []
     MU::Cloud.supportedClouds.each { |cloud|
-      require "mu/providers/#{cloud.downcase}"
+      begin
+        require "mu/providers/#{cloud.downcase}"
+      rescue LoadError, Gem::MissingSpecError => e
+        MU.log "Error loading #{cloud} library, calls into this provider will fail", MU::ERR, details: e.message
+        next
+      end
       cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
       @@generic_class_methods_toplevel.each { |method|
         if !cloudclass.respond_to?(method)

data/modules/mu/cloud/resource_base.rb

@@ -738,7 +738,7 @@ module MU
                 MU.log "Couldn't find existing resource #{ext_deploy["cloud_id"]}, #{ext_deploy["cloud_type"]}", MU::ERR if found.nil?
                 @deploy.notify(ext_deploy["cloud_type"], found.config["name"], found.deploydata, mu_name: found.mu_name, triggering_node: @mu_name)
               elsif ext_deploy["mu_name"] && ext_deploy["deploy_id"]
-                MU.log "#{ext_deploy["mu_name"]} / #{ext_deploy["deploy_id"]}"
+                MU.log "#{self}: Importing metadata for #{ext_deploy["cloud_type"]} #{ext_deploy["mu_name"]} from #{ext_deploy["deploy_id"]}"
                 found = MU::MommaCat.findStray(
                   @config['cloud'],
                   ext_deploy["cloud_type"],
@@ -748,8 +748,11 @@ module MU
                   dummy_ok: false
                 ).first
   
-                MU.log "Couldn't find existing resource #{ext_deploy["mu_name"]}/#{ext_deploy["deploy_id"]}, #{ext_deploy["cloud_type"]}", MU::ERR if found.nil?
-                @deploy.notify(ext_deploy["cloud_type"], found.config["name"], found.deploydata, mu_name: ext_deploy["mu_name"], triggering_node: @mu_name)
+                if found.nil?
+                  MU.log "Couldn't find existing resource #{ext_deploy["mu_name"]}/#{ext_deploy["deploy_id"]}, #{ext_deploy["cloud_type"]}", MU::ERR
+                else
+                  @deploy.notify(ext_deploy["cloud_type"], found.config["name"], found.deploydata, mu_name: ext_deploy["mu_name"], triggering_node: @mu_name)
+                end
               else
                 MU.log "Trying to find existing deploy, but either the cloud_id is not valid or no mu_name and deploy_id where provided", MU::ERR
               end
@@ -909,7 +912,7 @@ module MU
             }
 
             @deploydata = @cloudobj.deploydata
-            @config = @cloudobj.config
+            @config = MU::Config.manxify(@cloudobj.config)
             retval
           end
         } # end instance method list

data/modules/mu/cloud/ssh_sessions.rb

@@ -125,7 +125,7 @@ module MU
                 end
               end
             end
-          rescue RuntimeError => e
+          rescue RuntimeError, IOError => e
             raise MU::Cloud::BootstrapTempFail, "Got #{e.inspect} performing initial SSH connect tasks, will try again"
           end
 
@@ -187,6 +187,10 @@ module MU
             retry
 #            rescue SystemCallError, Timeout::Error, Errno::ECONNRESET, Errno::EHOSTUNREACH, Net::SSH::Proxy::ConnectError, SocketError, Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, IOError, Net::SSH::ConnectionTimeout, Net::SSH::Proxy::ConnectError, MU::Cloud::NetSSHFail => e
           rescue SystemExit, Timeout::Error, Net::SSH::AuthenticationFailed, Net::SSH::Disconnect, Net::SSH::ConnectionTimeout, Net::SSH::Proxy::ConnectError, Net::SSH::Exception, Errno::ECONNRESET, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::EPIPE, SocketError, IOError => e
+            if !active?
+              raise MuError, "Server #{@mu_name} disappeared while I was attempting to log into it"
+            end
+
             begin
               session.close if !session.nil?
             rescue Net::SSH::Disconnect, IOError => e

data/modules/mu/cloud/wrappers.rb

@@ -103,14 +103,23 @@ module MU
                 next
               end
 
-              found = cloudclass.find(args)
-              if !found.nil?
-                if found.is_a?(Hash)
-                  allfound.merge!(found)
-                else
-                  raise MuError, "#{cloudclass}.find returned a non-Hash result"
-                end
+              credsets = if args[:credentials]
+                [args[:credentials]]
+              else
+                cloudbase.listCredentials
               end
+
+              credsets.each { |creds|
+                args[:credentials] = creds
+                found = cloudclass.find(args)
+                if !found.nil?
+                  if found.is_a?(Hash)
+                    allfound.merge!(found)
+                  else
+                    raise MuError, "#{cloudclass}.find returned a non-Hash result"
+                  end
+                end
+              }
             rescue MuCloudResourceNotImplemented
             end
           }

data/modules/mu/config.rb

@@ -437,27 +437,27 @@ module MU
     # @param type [String]
     # @param phase [String]
     # @param no_create_wait [Boolean]
-    def self.addDependency(resource, name, type, phase: "create", no_create_wait: false)
-      if ![nil, "create", "groom"].include?(phase)
-        raise MuError, "Invalid phase '#{phase}' while adding dependency #{type} #{name} to #{resource['name']}"
+    def self.addDependency(resource, name, type, their_phase: "create", my_phase: nil)
+      if ![nil, "create", "groom"].include?(their_phase)
+        raise MuError, "Invalid their_phase '#{their_phase}' while adding dependency #{type} #{name} to #{resource['name']}"
       end
       resource['dependencies'] ||= []
       _shortclass, cfg_name, _cfg_plural, _classname = MU::Cloud.getResourceNames(type)
 
       resource['dependencies'].each { |dep|
         if dep['type'] == cfg_name and dep['name'].to_s == name.to_s
-          dep["no_create_wait"] = no_create_wait
-          dep["phase"] = phase if phase
+          dep["their_phase"] = their_phase if their_phase
+          dep["my_phase"] = my_phase if my_phase
           return
         end
       }
 
       newdep = {
         "type" => cfg_name,
-        "name"  => name.to_s,
-        "no_create_wait" => no_create_wait
+        "name"  => name.to_s
       }
-      newdep["phase"] = phase if phase
+      newdep["their_phase"] = their_phase if their_phase
+      newdep["my_phase"] = my_phase if my_phase
 
       resource['dependencies'] << newdep
 
@@ -746,7 +746,7 @@ module MU
           next if !acl_include["name"] and !acl_include["rule_name"]
           acl_include["name"] ||= acl_include["rule_name"]
           if haveLitterMate?(acl_include["name"], "firewall_rules")
-            MU::Config.addDependency(descriptor, acl_include["name"], "firewall_rule", no_create_wait: (cfg_name == "vpc"))
+            MU::Config.addDependency(descriptor, acl_include["name"], "firewall_rule", my_phase: ((cfg_name == "vpc") ? "groom" : "create"))
           elsif acl_include["name"]
             MU.log shortclass.to_s+" #{descriptor['name']} depends on FirewallRule #{acl_include["name"]}, but no such rule declared.", MU::ERR
             ok = false
@@ -892,6 +892,10 @@ module MU
           deleteme = []
 
           resource["dependencies"].each { |dependency|
+            dependency["their_phase"] ||= dependency["phase"]
+            dependency.delete("phase")
+            dependency["my_phase"] ||= dependency["no_create_wait"] ? "groom" : "create"
+            dependency.delete("no_create_wait")
             # make sure the thing we depend on really exists
             sibling = haveLitterMate?(dependency['name'], dependency['type'])
             if !sibling
@@ -929,10 +933,22 @@ module MU
               end
             end
 
+            if dependency['their_phase'] == "groom"
+              sibling['dependencies'].each { |sib_dep|
+                next if sib_dep['type'] != cfg_name or sib_dep['their_phase'] != "groom"
+                cousin = haveLitterMate?(sib_dep['name'], sib_dep['type'])
+                if cousin and cousin['name'] == resource['name']
+                  MU.log "Circular dependency between #{type} #{resource['name']} <=> #{dependency['type']} #{dependency['name']}", MU::ERR, details: [ resource['name'] => dependency, sibling['name'] => sib_dep ]
+                  ok = false
+                end
+              }
+            end
+
             # Check for a circular relationship that will lead to a deadlock
             # when creating resource. This only goes one layer deep, and does
             # not consider groom-phase deadlocks.
-            if dependency['phase'] == "groom" or dependency['no_create_wait'] or (
+            if dependency['their_phase'] == "groom" or
+               dependency['my_phase'] == "groom" or (
                  !MU::Cloud.resourceClass(sibling['cloud'], type).deps_wait_on_my_creation and
                  !MU::Cloud.resourceClass(resource['cloud'], type).waits_on_parent_completion
                )
@@ -941,7 +957,7 @@ module MU
 
             if sibling['dependencies']
               sibling['dependencies'].each { |sib_dep|
-                next if sib_dep['type'] != cfg_name or sib_dep['no_create_wait']
+                next if sib_dep['type'] != cfg_name or sib_dep['my_phase'] == "groom"
                 cousin = haveLitterMate?(sib_dep['name'], sib_dep['type'])
                 if cousin and cousin['name'] == resource['name']
                   MU.log "Circular dependency between #{type} #{resource['name']} <=> #{dependency['type']} #{dependency['name']}", MU::ERR, details: [ resource['name'] => dependency, sibling['name'] => sib_dep ]
@@ -1238,7 +1254,7 @@ module MU
                     "port" => db["port"],
                     "sgs" => [cfg_name+server['name']]
                   }
-                  MU::Config.addDependency(ruleset, cfg_name+server['name'], "firewall_rule", no_create_wait: true)
+                  MU::Config.addDependency(ruleset, cfg_name+server['name'], "firewall_rule", my_phase: "groom")
                 end
               }
             }

data/modules/mu/config/database.rb

@@ -341,7 +341,7 @@ module MU
               "region" => db['region'],
               "credentials" => db['credentials'],
             }
-            MU::Config.addDependency(replica, db["name"], "database", phase: "groom")
+            MU::Config.addDependency(replica, db["name"], "database", their_phase: "groom")
             read_replicas << replica
           end
         end
@@ -367,7 +367,7 @@ module MU
               "type" => "databases"
             }
             # AWS will figure out for us which database instance is the writer/master so we can create all of them concurrently.
-            MU::Config.addDependency(node, db["name"], "database", phase: "groom")
+            MU::Config.addDependency(node, db["name"], "database", their_phase: "groom")
             cluster_nodes << node
 
            # Alarms are set on each DB cluster node, not on the cluster itself,

data/modules/mu/config/firewall_rule.rb

@@ -119,7 +119,7 @@ module MU
         if acl_include['sgs']
           acl_include['sgs'].each { |sg_ref|
             if haveLitterMate?(sg_ref, "firewall_rules")
-              MU::Config.addDependency(acl, sg_ref, "firewall_rule", no_create_wait: true)
+              MU::Config.addDependency(acl, sg_ref, "firewall_rule", my_phase: "groom")
               siblingfw = haveLitterMate?(sg_ref, "firewall_rules")
               if !siblingfw["#MU_VALIDATED"]
 # XXX raise failure somehow

data/modules/mu/config/ref.rb

@@ -310,7 +310,7 @@ module MU
           return @obj
         end
 
-        if mommacat and !caller.grep(/`findLitterMate'/) # XXX the dumbest
+        if mommacat and caller.grep(/`findLitterMate'/).empty? # XXX the dumbest
           MU.log "Looking for #{@type} #{@name} #{@id} in deploy #{mommacat.deploy_id}", loglevel
           begin
             @obj = mommacat.findLitterMate(type: @type, name: @name, cloud_id: @id, credentials: @credentials, debug: debug)
@@ -365,7 +365,7 @@ end
               region: @region,
               habitats: hab_arg,
               credentials: @credentials,
-              dummy_ok: (["habitats", "folders", "users", "groups", "vpcs"].include?(@type))
+              dummy_ok: (["habitats", "folders", "users", "groups", "vpcs"].include?(@type) or @id)
             }
 
             found = MU::MommaCat.findStray(
@@ -377,7 +377,7 @@ end
               region: @region,
               habitats: hab_arg,
               credentials: @credentials,
-              dummy_ok: (["habitats", "folders", "users", "groups", "vpcs"].include?(@type))
+              dummy_ok: (["habitats", "folders", "users", "groups", "vpcs"].include?(@type) or @id)
             )
             MU.log "Ref#kitten results from findStray", loglevel, details: found
             @obj ||= found.first if found

data/modules/mu/config/schema_helpers.rb

@@ -185,15 +185,24 @@ module MU
               "type" => "string",
               "enum" => MU::Cloud.resource_types.values.map { |v| v[:cfg_name] }
             },
-            "phase" => {
+            "my_phase" => {
+              "type" => "string",
+              "description" => "Which part of our creation process should be waiting?",
+              "enum" => ["create", "groom"]
+            },
+            "their_phase" => {
               "type" => "string",
               "description" => "Which part of the creation process of the resource we depend on should we wait for before starting our own creation? Defaults are usually sensible, but sometimes you want, say, a Server to wait on another Server to be completely ready (through its groom phase) before starting up.",
               "enum" => ["create", "groom"]
             },
+            "phase" => {
+              "type" => "string",
+              "description" => "Alias for {their_phase}",
+              "enum" => ["create", "groom"]
+            },
             "no_create_wait" => {
               "type" => "boolean",
-              "default" => false,
-              "description" => "By default, it's assumed that we want to wait on our parents' creation phase, in addition to whatever is declared in this stanza. Setting this flag will bypass waiting on our parent resource's creation, so that our create or groom phase can instead depend only on the parent's groom phase. "
+              "description" => "DEPRECATED- setting +true+ is the same as setting {my_phase} to +groom+; setting to +false+ is the same as setting {my_phase} to +create+. If both +no_create_wait+ and {my_phase} are specified, {my_phase} takes precedence."
             }
           }
         }

data/modules/mu/config/server.rb

@@ -386,8 +386,7 @@ module MU
           },
           "associate_public_ip" => {
               "type" => "boolean",
-              "default" => false,
-              "description" => "Associate public IP address?"
+              "description" => "Whether to associate a public IP address with this server. Default behavior is to align with resident VPC/subnet, which to say +true+ if the subnet is publicly routable, +false+ if not. For non-VPC instances (AWS Classic), we default to +true+."
           },
           "userdata_script" => userdata_primitive,
           "windows_admin_username" => {
@@ -649,15 +648,22 @@ module MU
             server["vpc"]["subnet_pref"] = "public"
           end
 
+          if server["associate_public_ip"].nil?
+            server["associate_public_ip"] = server["vpc"]["subnet_pref"] == "public" ? true : false
+
+          end
+
           if !server["vpc"]["subnet_name"].nil? and configurator.nat_routes.has_key?(server["vpc"]["subnet_name"]) and !configurator.nat_routes[server["vpc"]["subnet_name"]].empty?
-            MU::Config.addDependency(server, configurator.nat_routes[server["vpc"]["subnet_name"]], "server", phase: "groom", no_create_wait: true)
+            MU::Config.addDependency(server, configurator.nat_routes[server["vpc"]["subnet_name"]], "server", their_phase: "groom", my_phase: "groom")
           elsif !server["vpc"]["name"].nil?
             siblingvpc = configurator.haveLitterMate?(server["vpc"]["name"], "vpcs")
             if siblingvpc and siblingvpc['bastion'] and
                server['name'] != siblingvpc['bastion']['name']
-              MU::Config.addDependency(server, siblingvpc['bastion']['name'], "server", phase: "groom", no_create_wait: true)
+              MU::Config.addDependency(server, siblingvpc['bastion']['name'], "server", their_phase: "groom", my_phase: "groom")
             end
           end
+        else
+          server["associate_public_ip"] ||= false
         end
 
         ok

data/modules/mu/config/server_pool.rb

@@ -186,7 +186,7 @@ module MU
 
         if !pool["vpc"].nil?
           if !pool["vpc"]["subnet_name"].nil? and configurator.nat_routes.has_key?(pool["vpc"]["subnet_name"])
-            MU::Config.addDependency(pool, configurator.nat_routes[pool["vpc"]["subnet_name"]], "server", phase: "groom", no_create_wait: true)
+            MU::Config.addDependency(pool, configurator.nat_routes[pool["vpc"]["subnet_name"]], "server", their_phase: "groom", my_phase: "groom")
           end
         end
 # TODO make sure this is handled... somewhere
@@ -199,7 +199,7 @@ module MU
 #          }
 #        end
         if pool["basis"] and pool["basis"]["server"]
-          MU::Config.addDependency(pool, pool["basis"]["server"], "server", phase: "groom")
+          MU::Config.addDependency(pool, pool["basis"]["server"], "server", their_phase: "groom")
         end
         if !pool['static_ip'].nil? and !pool['ip'].nil?
           ok = false

data/modules/mu/config/vpc.rb

@@ -540,7 +540,7 @@ module MU
             end
           end
 
-          # Feeling that, generate a generic bastion/NAT host to do the job.
+          # Failing that, generate a generic bastion/NAT host to do the job.
           # Clouds that don't have some kind of native NAT gateway can also
           # leverage this host to honor "gateway" => "#NAT" situations.
           if !can_peer and !already_peered and have_public and vpc["create_bastion"]
@@ -563,13 +563,13 @@ module MU
               "name" => vpc["name"],
               "subnet_pref" => "public"
             }
-            MU::Config.addDependency(vpc, bastion['name'], "server", no_create_wait: true)
-            vpc["bastion"] = MU::Config::Ref.get(
-              name: bastion['name'],
-              cloud: vpc['cloud'],
-              credentials: vpc['credentials'],
-              type: "servers"
-            )
+#            MU::Config.addDependency(vpc, bastion['name'], "server", my_phase: "groom")
+#            vpc["bastion"] = MU::Config::Ref.get(
+#              name: bastion['name'],
+#              cloud: vpc['cloud'],
+#              credentials: vpc['credentials'],
+#              type: "servers"
+#            )
 
             ok = false if !configurator.insertKitten(bastion, "servers", true)
           end
@@ -615,11 +615,11 @@ module MU
                     append_me = { "vpc" => peer["vpc"].dup }
                     append_me['vpc']['name'] = sib['name']
                     append << append_me
-                    MU::Config.addDependency(vpc, sib['name'], "vpc", phase: "groom", no_create_wait: true)
+                    MU::Config.addDependency(vpc, sib['name'], "vpc", their_phase: "create", my_phase: "groom")
                   end
                   delete << peer
                 else
-                  MU::Config.addDependency(vpc, peer['vpc']['name'], "vpc", phase: "groom", no_create_wait: true)
+                  MU::Config.addDependency(vpc, peer['vpc']['name'], "vpc", their_phase: "create", my_phase: "groom")
                 end
                 delete << peer if sib['name'] == vpc['name']
               }

data/modules/mu/defaults/AWS.yaml

@@ -1,55 +1,55 @@
 ---
 rhel71: &5
-  us-east-1: ami-0f05fce24aa75ba9f
-  ap-northeast-1: ami-0c0ec19eb19055763
-  ap-northeast-2: ami-0717ac5c67c99f745
-  ap-south-1: ami-03454a4bef3ec6a9a
-  ap-southeast-1: ami-0f3aa03320c0f6524
-  ap-southeast-2: ami-0aa5e6888260cdb3c
-  ca-central-1: ami-03e72964d7646b689
-  eu-central-1: ami-02df259ca785eff54
-  eu-north-1: ami-05253c445bdf7777d
-  eu-west-1: ami-0c21c559f6d0f2401
-  eu-west-2: ami-057c8d4259087594f
-  eu-west-3: ami-05a428dc7a7f4ba46
-  sa-east-1: ami-0a1d1cf6a89a2db56
-  us-east-2: ami-02f6682c7816b3cfc
-  us-west-1: ami-04898e596c06e802b
-  us-west-2: ami-02db5457189a8a8c2
+  us-east-1: ami-0c834836b3bd45e2f
+  ap-northeast-1: ami-036bb589253fe929e
+  ap-northeast-2: ami-0e39b4957dbc7e14d
+  ap-south-1: ami-0cd0554d9a05dddc9
+  ap-southeast-1: ami-0bae2684e9ed09b8b
+  ap-southeast-2: ami-0711ccf93abe3989b
+  ca-central-1: ami-0d75d90f73e417c25
+  eu-central-1: ami-0cae3cb53b9bbd783
+  eu-north-1: ami-0cd30fe8547a809f7
+  eu-west-1: ami-01441cca97c35eb0e
+  eu-west-2: ami-051aaf1b532b3e6bc
+  eu-west-3: ami-09a7af6793a3e8d09
+  sa-east-1: ami-0c4064cfe711311d5
+  us-east-2: ami-0124fd8917f59f8ce
+  us-west-1: ami-00457c55541605cb4
+  us-west-2: ami-02211d4e254a9e10f
 centos6: &4
-  us-east-1: ami-009723c5c7f8fbc75
-  us-east-2: ami-0781f11395714cd39
-  ap-northeast-1: ami-07fa5a8795da2b6bc
-  ap-northeast-2: ami-0219f0a7c979ff63f
-  ap-south-1: ami-0f24817242c401740
-  ap-southeast-1: ami-042ef2e0643e8e207
-  ap-southeast-2: ami-09fc51de648afa168
-  ca-central-1: ami-0dc643db74edc5aa5
-  eu-central-1: ami-0628759cb297569d5
-  eu-north-1: ami-0aed023791f886315
-  eu-west-1: ami-0f87f0f252ff03622
-  eu-west-2: ami-00abb555d5a460afe
-  eu-west-3: ami-0ccd93d454c2418a2
-  sa-east-1: ami-01e10ea6ea72534ae
-  us-west-1: ami-01fee56b9ee690ffe
-  us-west-2: ami-08bcdb944f185e2a8
+  us-east-1: ami-0ac9258984ed4bb4a
+  us-east-2: ami-09888b2b4484f774a
+  us-west-1: ami-04e7e499cdb873bfa
+  us-west-2: ami-0fcd16e6cf3c4b100
+  ap-northeast-1: ami-098052d1926fd4297
+  ap-northeast-2: ami-0319e58869a7b5bf2
+  ap-south-1: ami-0d19f7ad27c77cbf6
+  ap-southeast-1: ami-04b6b2013a296075c
+  ap-southeast-2: ami-07f02efb410df7e1d
+  ca-central-1: ami-0e7cc87df5666a78c
+  eu-central-1: ami-0cc33b333c7b7acd6
+  eu-north-1: ami-0bc09b1d6b4f351ea
+  eu-west-1: ami-08a7f444dba463099
+  eu-west-2: ami-0e84e5ba9694be11b
+  eu-west-3: ami-08e28291804571999
+  sa-east-1: ami-0b447e11308862517
 centos7:
-  us-east-1: ami-067256ca1497c924d
-  ap-northeast-1: ami-07c1e51354fdfd362
-  ap-northeast-2: ami-042b761c93d6df2f1
-  ap-south-1: ami-02e879f52322e7c98
-  ap-southeast-1: ami-0487e9f84d0ffde89
-  ap-southeast-2: ami-0e854dab39fd6a427
-  ca-central-1: ami-05a27d311b585a70b
-  eu-central-1: ami-0e396d00c787b4f47
-  eu-north-1: ami-087763a2ba60b2bfe
-  eu-west-1: ami-04e3bd9335a14e635
-  eu-west-2: ami-0efd34a8d1fc2b104
-  eu-west-3: ami-08d0bcbc780448cf8
-  sa-east-1: ami-0284f4a0968263cf0
-  us-east-2: ami-0292786917d1e3015
-  us-west-1: ami-0ba622529dcdff2bb
-  us-west-2: ami-079a309ca6261d7f6
+  us-east-1: ami-08d24209f345a21ab
+  ap-northeast-1: ami-001cfcb3548768288
+  ap-northeast-2: ami-0a2f6ec79ed710bf7
+  ap-south-1: ami-05e0c30fc8b2a21a2
+  ap-southeast-1: ami-0b28f5573dd4aa62a
+  ap-southeast-2: ami-026419375863852b7
+  ca-central-1: ami-01e799689fa5c1f31
+  eu-central-1: ami-0ded33da6c28082d8
+  eu-north-1: ami-02c7692e69b06afc5
+  eu-west-1: ami-086619450a959a101
+  eu-west-2: ami-05db24096d56207f6
+  eu-west-3: ami-03ea610526da7c2f3
+  sa-east-1: ami-0029cb6ee83a799ca
+  us-east-2: ami-065847253b2d4acab
+  us-west-1: ami-0ea3494c08412920e
+  us-west-2: ami-055ce4c70b0ceabcb
 ubuntu16: &3
   us-east-1: ami-bcdc16c6
   us-west-1: ami-1b17257b
@@ -73,56 +73,56 @@ ubuntu14:
   ap-southeast-1: ami-2855964b
   ap-southeast-2: ami-d19fc4b2
 win2k12r2: &1
-  us-east-1: ami-003aea65bc2e7136a
-  us-east-2: ami-0163293e39ba504c2
-  ca-central-1: ami-055689dd92f29d2aa
-  us-west-2: ami-0ce87dda2c9244e57
-  us-west-1: ami-00d9cf64bd2fafa44
-  eu-west-1: ami-026d7427b9fadad40
-  eu-west-2: ami-036a22c0780551794
-  eu-west-3: ami-05e3d9b79bdc10861
-  eu-north-1: ami-063eb48504c7d73f1
-  sa-east-1: ami-0a8c1829a5e650bc5
-  eu-central-1: ami-0ea20cef52335b008
-  ap-northeast-1: ami-08db2dc67228dbb90
-  ap-south-1: ami-012241411db3f09c3
-  ap-northeast-2: ami-0368c224de1d20502
-  ap-southeast-1: ami-028ef74e1edc3943a
-  ap-southeast-2: ami-09e03eab1b1bc151b
+  us-east-1: ami-0d28b9a40ed446e35
+  us-east-2: ami-010d247b7ee850d55
+  ca-central-1: ami-0c223858875f62d11
+  us-west-2: ami-01d188c5c06078fee
+  us-west-1: ami-0dbcc051c49ec24ec
+  eu-west-1: ami-080c7b4d6e32bf9f3
+  eu-west-2: ami-01b1edb5894a54bcc
+  eu-west-3: ami-09445cdc7a2acb1c0
+  eu-north-1: ami-0093cc63496e435df
+  sa-east-1: ami-04d015c8b371ba7b3
+  eu-central-1: ami-04d6144bcbb029141
+  ap-northeast-1: ami-07fad72f121aa157c
+  ap-south-1: ami-0b3241fd09b1ce87f
+  ap-northeast-2: ami-0ba7cd822e36dc0df
+  ap-southeast-1: ami-0648522a4cb50953c
+  ap-southeast-2: ami-0fc0bd73cd61a970f
 win2k16: &2
-  us-east-1: ami-02801a2c8dcbfb883
-  us-east-2: ami-0ca4f779a2a58a7ea
-  ca-central-1: ami-05d3854d9d6e9bcc5
-  us-west-2: ami-091f4a88ce32d28b6
-  eu-west-1: ami-0b938c9b23ed7d18c
-  us-west-1: ami-0fd744c3fbe8260f2
-  eu-west-2: ami-071a89b959c5eda27
-  eu-west-3: ami-0b206e3dbda9ff9eb
-  eu-central-1: ami-0dd9bdad31dd0d3ce
-  sa-east-1: ami-0d69b8d6c0f9a7bae
-  ap-northeast-1: ami-02eb4a6f519bc3190
-  ap-south-1: ami-0666fd543ac8b5501
-  ap-northeast-2: ami-01277c81f9b91cf77
-  ap-southeast-2: ami-0426a246f9b0ccadd
-  ap-southeast-1: ami-07ecb0d55c2eb7247
-  eu-north-1: ami-047811530583b6d08
+  us-east-1: ami-018151f8c8339a093
+  us-east-2: ami-09e045936c7d9ecd5
+  ca-central-1: ami-0a16abf0f1c35667a
+  us-west-2: ami-00d4216f80a82894d
+  eu-west-1: ami-07afc1525928ccad7
+  us-west-1: ami-0d2f7d4198b79a625
+  eu-west-2: ami-04eb62f17efc84a37
+  eu-west-3: ami-0b4affcd5848cf50c
+  eu-central-1: ami-0a92ae047ebc7a3da
+  sa-east-1: ami-0cc9a87c95fb37832
+  ap-northeast-1: ami-014c730050acef11d
+  ap-south-1: ami-0c3c8739263aa4844
+  ap-northeast-2: ami-0018a05eb15503b5e
+  ap-southeast-2: ami-0b50bfbb507285a89
+  ap-southeast-1: ami-073c677bcf225774a
+  eu-north-1: ami-09bb6d618593f2e7f
 win2k19:
-  us-east-1: ami-00820419bf212df7e
-  us-east-2: ami-0a7916b90aa4629d5
-  ca-central-1: ami-0d704529661e19185
-  us-west-2: ami-0ee6a198d7ac35eb1
-  eu-west-2: ami-0f6ac1634bd7add92
-  us-west-1: ami-039e3816b4cac1e27
-  eu-west-1: ami-03a771d99091199b7
-  eu-central-1: ami-03b648d5b45f51a4f
-  eu-west-3: ami-068839907c18c3a6e
-  eu-north-1: ami-0db851ee76f7deefb
-  sa-east-1: ami-0c2cc60c62159f87c
-  ap-northeast-2: ami-06bdf8ae9ae9add92
-  ap-northeast-1: ami-02306d959c7f175b9
-  ap-southeast-1: ami-0d5b4a3d73e0f471f
-  ap-southeast-2: ami-00fa88caff4f64937
-  ap-south-1: ami-0b44feae4bb9f497a
+  us-east-1: ami-09c18c34c341f2b6a
+  us-east-2: ami-030371d5ee8881350
+  ca-central-1: ami-018e5bf45c30fa58f
+  us-west-2: ami-07d1e5c4f906877e1
+  eu-west-2: ami-0b9d95fef44aa7c11
+  us-west-1: ami-0e7e082d6fa1769f3
+  eu-west-1: ami-05573fafa080144b6
+  eu-central-1: ami-0122b027c265988ea
+  eu-west-3: ami-0ba7c0a3dc4148b6a
+  eu-north-1: ami-03d8c3307f72f9847
+  sa-east-1: ami-0d0f66c3e0dfc09ee
+  ap-northeast-2: ami-07eff56de9293ab16
+  ap-northeast-1: ami-020fb790a3bed4cda
+  ap-southeast-1: ami-0b5d036d6d711a4c8
+  ap-southeast-2: ami-0fff96935fef7bf60
+  ap-south-1: ami-030ec249497f66a33
 amazon:
   us-east-1: ami-b73b63a0
   us-east-2: ami-58277d3d