cloud-mu 3.1.6 → 3.4.0

data/modules/mu/config/user.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/user.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/user.rb
     class User
 
       # Base configuration schema for a User

data/modules/mu/config/vpc.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/vpc.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/vpc.rb
     class VPC
 
       # Base configuration schema for a VPC
@@ -417,9 +417,10 @@ module MU
         using_default_cidr = false
         if !vpc['ip_block']
           if configurator.updating and configurator.existing_deploy and
+             configurator.existing_deploy.original_config and
              configurator.existing_deploy.original_config['vpcs']
             configurator.existing_deploy.original_config['vpcs'].each { |v|
-              if v['name'] == vpc['name']
+              if v['name'].to_s == vpc['name'].to_s
                 vpc['ip_block'] = v['ip_block']
                 vpc['peers'] ||= []
                 vpc['peers'].concat(v['peers'])
@@ -431,6 +432,10 @@ module MU
                 break
               end
             }
+            if !vpc['ip_block']
+              MU.log "Loading existing deploy but can't find IP block of VPC #{vpc['name']}", MU::ERR
+              ok = false
+            end
           else
             using_default_cidr = true
             vpc['ip_block'] = "10.0.0.0/16"
@@ -539,7 +544,7 @@ module MU
           # 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"]
-            serverclass = Object.const_get("MU").const_get("Cloud").const_get(vpc["cloud"]).const_get("Server")
+            serverclass = MU::Cloud.resourceClass(vpc["cloud"], "Server")
             bastion = serverclass.genericNAT.dup
             bastion["groomer_variables"] = {
               "nat_ip_block" => vpc["ip_block"].to_s
@@ -558,10 +563,7 @@ module MU
               "name" => vpc["name"],
               "subnet_pref" => "public"
             }
-            vpc["dependencies"] << {
-              "type" => "server",
-              "name" => bastion['name'],
-            }
+            MU::Config.addDependency(vpc, bastion['name'], "server", no_create_wait: true)
             vpc["bastion"] = MU::Config::Ref.get(
               name: bastion['name'],
               cloud: vpc['cloud'],
@@ -596,7 +598,7 @@ module MU
               MU.log "Skipping malformed VPC peer in #{vpc['name']}", MU::ERR, details: peer
               next
             end
-            peer["#MU_CLOUDCLASS"] = Object.const_get("MU").const_get("Cloud").const_get("VPC")
+            peer["#MU_CLOUDCLASS"] = MU::Cloud.loadBaseType("VPC")
             # We check for multiple siblings because some implementations
             # (Google) can split declared VPCs into parts to get the mimic the
             # routing behaviors we expect.
@@ -613,17 +615,11 @@ module MU
                     append_me = { "vpc" => peer["vpc"].dup }
                     append_me['vpc']['name'] = sib['name']
                     append << append_me
-                    vpc["dependencies"] << {
-                      "type" => "vpc",
-                      "name" => sib['name']
-                    }
+                    MU::Config.addDependency(vpc, sib['name'], "vpc", phase: "groom", no_create_wait: true)
                   end
                   delete << peer
                 else
-                  vpc["dependencies"] << {
-                    "type" => "vpc",
-                    "name" => peer['vpc']["name"]
-                  }
+                  MU::Config.addDependency(vpc, peer['vpc']['name'], "vpc", phase: "groom", no_create_wait: true)
                 end
                 delete << peer if sib['name'] == vpc['name']
               }
@@ -800,7 +796,7 @@ MU.log "VPC lookup cache hit", MU::WARN, details: vpc_block
               @@reference_cache[vpc_block] ||= ext_vpc if ok
             end
           rescue StandardError => e
-            raise MuError, e.inspect, [caller, e.backtrace]
+            raise MuError.new e.inspect, details: { "my call stack" => caller, "exception call stack" => e.backtrace }
           ensure
             if !ext_vpc and vpc_block['cloud'] != "CloudFormation"
               MU.log "Couldn't resolve VPC reference to a unique live VPC in #{parent_type} #{parent['name']} (called by #{caller[0]})", MU::ERR, details: vpc_block

data/modules/mu/defaults/AWS.yaml

@@ -1,56 +1,56 @@
 ---
-rhel71: &4
-  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
-centos6: &3
-  us-east-1: ami-06b6c01abc6998348
-  ap-northeast-1: ami-0c5da73fde2cb6437
-  ap-northeast-2: ami-0134fce6dc00eb00d
-  ap-south-1: ami-0e59a612e7c84836b
-  ap-southeast-1: ami-0e16974f528ae0dae
-  ap-southeast-2: ami-0e2feddf3dbf4d539
-  ca-central-1: ami-089236a344dadad5f
-  eu-central-1: ami-0c4eed3fe046c3917
-  eu-north-1: ami-05f636e89d0362c14
-  eu-west-1: ami-00c50b11d713f90d3
-  eu-west-2: ami-06cc78c32eed7f944
-  eu-west-3: ami-0ba626236ad786c54
-  sa-east-1: ami-07c3b2a5a41e92376
-  us-east-2: ami-01129e636778acfbc
-  us-west-1: ami-0632e646cd5089ffc
-  us-west-2: ami-0ce4c9f2e1037de53
+rhel71: &5
+  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-0ccdc671f12147a1d
+  us-east-2: ami-00d0e8bc2f05ab949
+  ap-northeast-1: ami-0726801ceef87f5f8
+  ap-northeast-2: ami-05fa4afc4a0493b0a
+  ap-south-1: ami-0d6e4f3b6592b3139
+  ap-southeast-1: ami-0c988e3dc80b14653
+  ap-southeast-2: ami-02ac856fd094675ef
+  ca-central-1: ami-0ce7e343953af2292
+  eu-central-1: ami-0ce8317423cea27b8
+  eu-north-1: ami-0a923b493d5fc9743
+  eu-west-1: ami-06e0f02328921c865
+  eu-west-2: ami-07ae118c8814df140
+  eu-west-3: ami-03c1017cd1ccc6e9d
+  sa-east-1: ami-05212ae133b9c3ba1
+  us-west-1: ami-0b05ec54412b9f8b0
+  us-west-2: ami-0447e036b102b2ca0
 centos7:
-  us-east-1: ami-07e6f661e71ad964b
-  ap-northeast-1: ami-0988180d74897c639
-  ap-northeast-2: ami-0e77cd1c7024b8ae0
-  ap-south-1: ami-02bd479122041000a
-  ap-southeast-1: ami-017767778ef9db671
-  ap-southeast-2: ami-05b09a58c3964d67d
-  ca-central-1: ami-0a59a176d810fcc5f
-  eu-central-1: ami-0b48a421fb05d96af
-  eu-north-1: ami-02337601ea5dc4a5d
-  eu-west-1: ami-0b0a55b7423eeac07
-  eu-west-2: ami-060518b40b25b9eb4
-  eu-west-3: ami-060957bb3adacd831
-  sa-east-1: ami-0c706132b35071de6
-  us-east-2: ami-0db4c266ed0bb958b
-  us-west-1: ami-0980f6eb52c998793
-  us-west-2: ami-07f2ed4755c01c05c
-ubuntu16: &2
+  us-east-1: ami-0be9d646b29a9f51d
+  ap-northeast-1: ami-0ea500fc488406ad8
+  ap-northeast-2: ami-062d5536e5ebf04e9
+  ap-south-1: ami-0c2bf51384a5dcd92
+  ap-southeast-1: ami-0a8022e9bb353022f
+  ap-southeast-2: ami-03d47c88f2e01203b
+  ca-central-1: ami-0f0dc8a3e18a28544
+  eu-central-1: ami-0ea618bc5a1f372a2
+  eu-north-1: ami-02b062056e7dd4741
+  eu-west-1: ami-03851110db1a143e7
+  eu-west-2: ami-03800a8fe524171d2
+  eu-west-3: ami-074acd461ca002f0a
+  sa-east-1: ami-00c88550221a205f9
+  us-east-2: ami-098da5da2eef484e5
+  us-west-1: ami-0eea632474ef51860
+  us-west-2: ami-075aad0e6e9fc5654
+ubuntu16: &3
   us-east-1: ami-bcdc16c6
   us-west-1: ami-1b17257b
   us-west-2: ami-19e92861
@@ -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
-win2k16: &5
-  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-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-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
@@ -137,9 +137,9 @@ amazon:
   ap-southeast-1: ami-b953f2da
   ap-southeast-2: ami-db704cb8
 win2k12: *1
-windows: *5
-ubuntu: *2
-centos: *3
-rhel7: *4
-rhel: *4
-linux: *3
+windows: *2
+ubuntu: *3
+centos: *4
+rhel7: *5
+rhel: *5
+linux: *4

data/modules/mu/defaults/Azure.yaml

@@ -2,6 +2,7 @@
 centos6: &centos6 OpenLogic/CentOS/6
 #centos7: &centos7 westernoceansoftwaresprivatelimited/centos-7-6/centos-7-6-server
 centos7: &centos7 OpenLogic/CentOS/7
+centos8: &centos7 OpenLogic/CentOS/8
 rhel8: &rhel8 RedHat/RHEL/8
 rhel7: &rhel7 RedHat/RHEL/7
 rhel6: &rhel6 RedHat/RHEL/6

data/modules/mu/defaults/Google.yaml

@@ -1,6 +1,7 @@
 ---
 centos6: &centos6 egt-labs-admin/mu-centos-6
 centos7: &centos7 egt-labs-admin/mu-centos-7
+centos8: &centos8 centos-cloud/centos-8 
 rhel71: &rhel71 rhel-cloud/rhel-7
 rhel6: &rhel6 rhel-cloud/rhel-6
 debian10: &debian10 debian-cloud/debian-10

data/modules/mu/deploy.rb

@@ -157,6 +157,7 @@ module MU
           _shortclass, _cfg_name, _cfg_plural, classname = MU::Cloud.getResourceNames(data[:cfg_plural])
           @main_config[data[:cfg_plural]].each { |resource|
             resource["#MU_CLOUDCLASS"] = classname
+#            resource["#MU_CLOUDCLASS"] = MU::Cloud.resourceClass(resource['cloud'], data[:cfg_plural])
           }
           setThreadDependencies(@main_config[data[:cfg_plural]])
         end
@@ -265,7 +266,7 @@ module MU
         # Run cloud provider-specific deploy meta-artifact creation (ssh keys,
         # resource groups, etc)
         @mommacat.cloudsUsed.each { |cloud|
-          cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
+          cloudclass = MU::Cloud.cloudClass(cloud)
           cloudclass.initDeploy(@mommacat)
         }
 
@@ -311,6 +312,17 @@ module MU
 
         @mommacat.save!
 
+        # XXX Functions have a special behavior where we re-invoke their groom
+        # methods one more time at the end, so we can guarantee their
+        # environments are fully populated with all sibling resource idents
+        # regardless of dependency order. This is, obviously, a disgusting
+        # hack, and we should revisit our dependency language in the next big
+        # release.
+        if !@main_config["functions"].nil? and
+            @main_config["functions"].size > 0
+          createResources(@main_config["functions"], "groom")
+        end
+
       rescue StandardError => e
         MU.log e.class.name, MU::ERR, details: caller
 
@@ -425,10 +437,10 @@ module MU
           MU.log "Failed to generate AWS cost-calculation URL. Skipping.", MU::WARN, details: "Deployment uses a feature not available in CloudFormation layer.", verbosity: MU::Logger::NORMAL
         ensure
           MU.setLogging(@verbosity)
-          MU.log "Deployment #{MU.deploy_id} \"#{MU.handle}\" complete", details: deployment, verbosity: @verbosity
+          MU.log "Deployment #{MU.deploy_id} \"#{MU.handle}\" #{@updating ? "updated" : "complete"}", details: deployment, verbosity: @verbosity
         end
       else
-        MU.log "Deployment #{MU.deploy_id} \"#{MU.handle}\" complete", details: deployment, verbosity: @verbosity
+        MU.log "Deployment #{MU.deploy_id} \"#{MU.handle}\" #{@updating ? "updated" : "complete"}", details: deployment, verbosity: @verbosity
       end
 
 
@@ -438,7 +450,7 @@ module MU
         }
       end
 
-      @mommacat.sendAdminSlack("Deploy completed succesfully", msg: MU.summary.join("\n"))
+      @mommacat.sendAdminSlack("Deploy #{MU.deploy_id} \"#{MU.handle}\" #{@updating ? "updated" : "complete"}", msg: MU.summary.join("\n"))
     end
 
     private
@@ -554,16 +566,9 @@ MESSAGE_END
         @dependency_threads["#{name}_groom"]=["#{name}_create", "mu_groom_container"]
 
         MU.log "Setting dependencies for #{name}", MU::DEBUG, details: resource["dependencies"]
-        if resource["dependencies"] != nil then
+        if !resource["dependencies"].nil? then
           resource["dependencies"].each { |dependency|
-            parent_class = nil
-            MU::Cloud.resource_types.each_pair { |res_class, attrs|
-              if attrs[:cfg_name] == dependency['type'] or
-                 attrs[:cfg_plural] == dependency['type']
-                parent_class = Object.const_get("MU").const_get("Cloud").const_get(res_class)
-                break
-              end
-            }
+            parent_class = MU::Cloud.loadBaseType(dependency['type'])
 
             parent_type = parent_class.cfg_name
 
@@ -572,10 +577,10 @@ MESSAGE_END
             addDependentThread(parent, "#{name}_groom")
 
             # should our creation thread also wait on our parent's create?
-            if !resource["no_create_wait"] and
+            if !dependency["no_create_wait"] and
                (resource["#MU_CLOUDCLASS"].waits_on_parent_completion or
                dependency['phase'] == "create" or
-               (parent_class.deps_wait_on_my_creation and parent_type != res_type))
+               parent_class.deps_wait_on_my_creation)
               addDependentThread(parent, "#{name}_create")
             end
 
@@ -584,12 +589,18 @@ MESSAGE_END
             if (dependency['phase'] == "groom" or resource["#MU_CLOUDCLASS"].waits_on_parent_completion) and parent_class.instance_methods(false).include?(:groom)
               parent = parent_type+"_"+dependency["name"]+"_groom"
               addDependentThread(parent, "#{name}_groom")
-              if (parent_class.deps_wait_on_my_creation and parent_type != res_type) or resource["#MU_CLOUDCLASS"].waits_on_parent_completion or dependency['phase'] == "groom"
+              if !dependency["no_create_wait"] and (
+                   parent_class.deps_wait_on_my_creation or
+                   resource["#MU_CLOUDCLASS"].waits_on_parent_completion or
+                   dependency['phase'] == "groom"
+                 )
                 addDependentThread(parent, "#{name}_create")
               end
             end
           }
         end
+        MU.log "Thread dependencies #{res_type}[#{name}]", MU::DEBUG, details: { "create" => @dependency_threads["#{name}_create"], "groom" => @dependency_threads["#{name}_groom"] }
+        @dependency_threads["#{name}_groom"]=["#{name}_create", "mu_groom_container"]
       }
     end
 
@@ -623,7 +634,7 @@ MESSAGE_END
             begin
               if myservice['#MUOBJECT'].nil?
                 if @mommacat
-                  ext_obj = @mommacat.findLitterMate(type: myservice["#MU_CLOUDCLASS"].cfg_plural, name: myservice['name'], credentials: myservice['credentials'], created_only: true, return_all: false)
+                  ext_obj = @mommacat.findLitterMate(type: myservice["#MU_CLOUDCLASS"].cfg_plural, name: myservice['name'], credentials: myservice['credentials'], created_only: true, return_all: false, ignore_missing: !@updating)
                   if @updating and ext_obj
                     ext_obj.config!(myservice)
                   end
@@ -651,8 +662,9 @@ MESSAGE_END
               run_this_method = myservice['#MUOBJECT'].method(mode)
             rescue StandardError => e
               MU::MommaCat.unlockAll
-              @main_thread.raise MuError, "Error invoking #{myservice["#MU_CLOUDCLASS"]}.#{mode} for #{myservice['name']} (#{e.inspect})", e.backtrace
-              raise e
+              @main_thread.raise MuError, "Error invoking #{myservice["#MUOBJECT"].class.name}.#{mode} for #{myservice['name']} (#{e.inspect})", e.backtrace
+              return
+#              raise e
             end
             begin
               MU.log "Checking whether to run #{myservice['#MUOBJECT']}.#{mode} (updating: #{@updating})", MU::DEBUG
@@ -732,7 +744,9 @@ MESSAGE_END
           sleep 10+Random.rand(20)
           retry
         end
+
       end
+
     end
 
   end #class