cloud-mu 3.3.2 → 3.4.0

data/extras/clean-stock-amis

@@ -23,7 +23,7 @@ $opts = Optimist::options do
 #{$0} [-c credentials] [-i imagename]
   EOS
   opt :credentials, "Use these AWS credentials from mu.yaml instead of the default set", :required => false, :type => :string
-  opt :image, "Purge a specific image, instead of just scrubing old ones", :required => false, :type => :string
+  opt :image, "Purge a specific image, instead of just scrubbing old ones", :required => false, :type => :string
 end
 
 filters = [
@@ -33,12 +33,14 @@ filters = [
   }
 ]
 
+in_use = MU::Cloud.getStockImage("AWS").values.flatten.map { |h| h.values }.flatten
 
 MU::Cloud::AWS.listRegions.each { | r|
   images = MU::Cloud::AWS.ec2(region: r, credentials: $opts[:credentials]).describe_images(
     filters: filters + [{ "name" => "state", "values" => ["available"]}]
   ).images
   images.each { |ami|
+    next if in_use.include?(ami)
     if ($opts[:image] and ami.name == $opts[:image]) or 
        ((DateTime.now.to_time - DateTime.parse(ami.creation_date).to_time) > 15552000 and ami.name.match(/^MU-(PROD|DEV)/))
       snaps = []
@@ -53,7 +55,13 @@ MU::Cloud::AWS.listRegions.each { | r|
       rescue Aws::EC2::Errors::InvalidAMIIDUnavailable
       end
         snaps.each { |snap_id|
-          MU::Cloud::AWS.ec2(region: r, credentials: $opts[:credentials]).delete_snapshot(snapshot_id: snap_id)
+          begin
+            MU::Cloud::AWS.ec2(region: r, credentials: $opts[:credentials]).delete_snapshot(snapshot_id: snap_id)
+          rescue Aws::EC2::Errors::InvalidSnapshotInUse
+            sleep 5
+            retry
+          rescue Aws::EC2::Errors::InvalidSnapshotNotFound
+          end
         }
     end
   }

data/extras/generate-stock-images

@@ -63,6 +63,7 @@ end
 now = DateTime.now
 
 exitcode = 0
+succeeded = 0
 $opts[:clouds].each { |cloud|
   current_images = MU::Cloud.getStockImage(cloud, fail_hard: true)
   $opts[:platforms].each { |platform|
@@ -114,6 +115,7 @@ $opts[:clouds].each { |cloud|
           # Scrub any loose metadata left over from our image deployment. It's
           # ok, this won't touch the images we just made.
           MU::Cleanup.run(deployer.mommacat.deploy_id, skipsnapshots: true, verbosity: MU::Logger::QUIET)
+          succeeded += 1
         rescue Exception => e
           MU.log e.message, MU::ERR
           exitcode = 1
@@ -122,10 +124,11 @@ $opts[:clouds].each { |cloud|
     end
   }
 
-  if !available_clouds.keys.include?("AWS") # XXX or if we don't have permissions
+  if !$opts[:dryrun] and succeeded > 0
     puts current_images.to_yaml
-  elsif !$opts[:dryrun]
-    MU::Cloud::AWS::Bucket.upload($opts[:upload_to]+"/"+cloud+".yaml", data: current_images.to_yaml, credentials: $opts[:aws_creds], acl: "public-read")
+    if available_clouds.keys.include?("AWS")
+      MU::Cloud::AWS::Bucket.upload($opts[:upload_to]+"/"+cloud+".yaml", data: current_images.to_yaml, credentials: $opts[:aws_creds], acl: "public-read")
+    end
   end
 }
 

data/extras/image-generators/AWS/centos7.yaml

@@ -1,17 +1,20 @@
 ---
-  appname: mu
-  servers: 
-    - 
-      name: centos7
-      platform: centos7
-      size: m3.medium
-      scrub_groomer: true
-      run_list:
-      - recipe[mu-tools::apply_security]
-      - recipe[mu-tools::updates]
-      - recipe[mu-tools::split_var_partitions]
-      create_image:
-        image_then_destroy: true
-        public: true
-        copy_to_regions:
-        - "#ALL"
+appname: mu
+servers: 
+- name: centos7
+  platform: centos7
+  size: m4.large
+  vpc:
+    name: c7vpc
+  scrub_groomer: true
+  run_list:
+  - recipe[mu-tools::apply_security]
+  - recipe[mu-tools::updates]
+  - recipe[mu-tools::split_var_partitions]
+  create_image:
+    image_then_destroy: true
+    public: true
+    copy_to_regions:
+    - "#ALL"
+vpcs:
+- name: c7vpc

data/modules/mommacat.ru

@@ -387,7 +387,7 @@ app = proc do |env|
 
 # XXX We can't assume AWS anymore. What does this look like otherwise?
 # If this is an already-groomed instance, try to get a real object for it
-      instance = MU::MommaCat.findStray("AWS", "server", cloud_id: req["mu_instance_id"], region: server_cfg["region"], deploy_id: req["mu_id"], name: req["mu_resource_name"], dummy_ok: false, calling_deploy: kittenpile).first
+      instance = MU::MommaCat.findStray("AWS", "server", cloud_id: req["mu_instance_id"], region: server_cfg["region"], deploy_id: req["mu_id"], name: req["mu_resource_name"], dummy_ok: true, calling_deploy: kittenpile).first
       mu_name = nil
       if instance.nil?
         # Now we're just checking for existence in the cloud provider, really
@@ -416,7 +416,7 @@ app = proc do |env|
         if instance.respond_to?(:addVolume)
 # XXX make sure we handle mangled input safely
           params = JSON.parse(Base64.decode64(req["add_volume"]))
-MU.log "ADDVOLUME REQUEST", MU::WARN, details: params
+          MU.log "add_volume request", MU::NOTICE, details: params
           instance.addVolume(params["dev"], params["size"], delete_on_termination: params["delete_on_termination"])
         else
           returnval = throw500 "I don't know how to add a volume for #{instance}"

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/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)

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-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-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-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
@@ -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

data/modules/mu/mommacat.rb

@@ -547,7 +547,7 @@ module MU
     # @param remove [Boolean]: Remove this resource from the deploy structure, instead of adding it.
     # @return [void]
     def notify(type, key, data, mu_name: nil, remove: false, triggering_node: nil, delayed_save: false)
-      no_write = (@no_artifacts or caller.grep(/\/mommacat\.rb:\d+:in `notify'/))
+      no_write = (@no_artifacts or !caller.grep(/\/mommacat\.rb:\d+:in `notify'/).empty?)
 
       begin
         if !no_write
@@ -560,7 +560,13 @@ module MU
           loadDeploy(true) # make sure we're saving the latest and greatest
         end
 
-        _shortclass, _cfg_name, type, _classname, attrs = MU::Cloud.getResourceNames(type, false)
+        @timestamp ||= @deployment['timestamp']
+        @seed ||= @deployment['seed']
+        @appname ||= @deployment['appname']
+        @handle ||= @deployment['handle']
+        
+        _shortclass, _cfg_name, mu_type, _classname, attrs = MU::Cloud.getResourceNames(type, false)
+        type = mu_type if mu_type
         has_multiples = attrs[:has_multiples] ? true : false
 
         mu_name ||= if !data.nil? and !data["mu_name"].nil?
@@ -574,6 +580,7 @@ module MU
         end
 
         @need_deploy_flush = true
+        @last_modified = Time.now
 
         if !remove
           if data.nil?
@@ -903,6 +910,7 @@ MAIL_HEAD_END
     ###########################################################################
     ###########################################################################
     def setThreadContextToMe
+
       ["appname", "environment", "timestamp", "seed", "handle"].each { |var|
         @deployment[var] ||= instance_variable_get("@#{var}".to_sym)
         if @deployment[var]

data/modules/mu/mommacat/search.rb

@@ -107,8 +107,17 @@ module MU
       matches = []
 
       credlist.each { |creds|
-#            next if region and region.is_a?(Array) and !region.empty? and !region.include?(r)
-        cloud_descs = search_cloud_provider(type, cloud, habitats, region, cloud_id: cloud_id, tag_key: tag_key, tag_value: tag_value, credentials: creds, flags: flags)
+        cur_habitats = []
+
+        if habitats and !habitats.empty? and habitats != [nil]
+          valid_habitats = cloudclass.listHabitats(creds)
+          cur_habitats = (habitats & valid_habitats)
+          next if cur_habitats.empty?
+        else
+          cur_habitats = cloudclass.listHabitats(creds)
+        end
+
+        cloud_descs = search_cloud_provider(type, cloud, cur_habitats, region, cloud_id: cloud_id, tag_key: tag_key, tag_value: tag_value, credentials: creds, flags: flags)
 
         cloud_descs.each_pair.each { |p, regions|
           regions.each_pair.each { |r, results|

data/modules/mu/mommacat/storage.rb

@@ -202,14 +202,16 @@ module MU
 
       MU.log "Getting a lock on #{lockdir}/#{id}.lock (thread #{Thread.current.object_id})...", MU::DEBUG, details: caller
       show_relevant = Proc.new {
-        @locks.each_pair { |thread_id, lock|
-          lock.each_pair { |lockid, lockpath|
-            if lockid == id
-              thread = Thread.list.select { |t| t.object_id == thread_id }.first
-              if thread.object_id != Thread.current.object_id
-                MU.log "#{thread_id} sitting on #{id}", MU::WARN, thread.backtrace
+        @lock_semaphore.synchronize {
+          @locks.each_pair { |thread_id, lock|
+            lock.each_pair { |lockid, lockpath|
+              if lockid == id
+                thread = Thread.list.select { |t| t.object_id == thread_id }.first
+                if thread.object_id != Thread.current.object_id
+                  MU.log "#{thread_id} sitting on #{id}", MU::WARN, thread.backtrace
+                end
               end
-            end
+            }
           }
         }
       }
@@ -218,11 +220,13 @@ module MU
           if !@locks[Thread.current.object_id][id].flock(File::LOCK_EX|File::LOCK_NB)
             if retries > 0
               success = false
-              MU.retrier([], loop_if: Proc.new { !success }, loop_msg: "Waiting for lock on #{lockdir}/#{id}.lock...", max: retries) {
+              MU.retrier([], loop_if: Proc.new { !success }, loop_msg: "Waiting for lock on #{lockdir}/#{id}.lock...", max: retries) { |cur_retries, _wait|
                 success = @locks[Thread.current.object_id][id].flock(File::LOCK_EX|File::LOCK_NB)
-              show_relevant.call() if !success
+                if !success and cur_retries > 0 and (cur_retries % 3) == 0
+                  show_relevant.call(cur_retries)
+                end
               }
-              show_relevant.call() if !success
+              show_relevant.call(cur_retries) if !success
               return success
             else
               return false
@@ -415,6 +419,7 @@ module MU
           deploy.flock(File::LOCK_UN)
           deploy.close
           @need_deploy_flush = false
+          @last_modified = nil
           MU::MommaCat.updateLitter(@deploy_id, self)
         end
 
@@ -643,6 +648,14 @@ module MU
     def loadDeployFromCache(set_context_to_me = true)
       return false if !File.size?(deploy_dir+"/deployment.json")
 
+      lastmod = File.mtime("#{deploy_dir}/deployment.json")
+      if @last_modified and lastmod < @last_modified
+        MU.log "#{deploy_dir}/deployment.json last written at #{lastmod}, live meta at #{@last_modified}, not loading", MU::WARN if @last_modified
+        # this is a weird place for this
+        setThreadContextToMe if set_context_to_me
+        return true
+      end
+
       deploy = File.open("#{deploy_dir}/deployment.json", File::RDONLY)
       MU.log "Getting lock to read #{deploy_dir}/deployment.json", MU::DEBUG
       # deploy.flock(File::LOCK_EX)
@@ -654,6 +667,7 @@ module MU
 
       begin
         @deployment = JSON.parse(File.read("#{deploy_dir}/deployment.json"))
+# XXX is it worthwhile to merge fuckery?
       rescue JSON::ParserError => e
         MU.log "JSON parse failed on #{deploy_dir}/deployment.json", MU::ERR, details: e.message
       end
@@ -663,20 +677,21 @@ module MU
 
       setThreadContextToMe if set_context_to_me
 
-      @timestamp = @deployment['timestamp']
-      @seed = @deployment['seed']
-      @appname = @deployment['appname']
-      @handle = @deployment['handle']
-
       true
     end
 
+
     ###########################################################################
     ###########################################################################
     def loadDeploy(deployment_json_only = false, set_context_to_me: true)
       MU::MommaCat.deploy_struct_semaphore.synchronize {
         success = loadDeployFromCache(set_context_to_me)
 
+        @timestamp ||= @deployment['timestamp']
+        @seed ||= @deployment['seed']
+        @appname ||= @deployment['appname']
+        @handle ||= @deployment['handle']
+
         return if deployment_json_only and success
 
         if File.exist?(deploy_dir+"/private_key")