modules/mu/deploy.rb in cloud-mu-3.0.2 vs modules/mu/deploy.rb in cloud-mu-3.1.0
- old
+ new
@@ -129,10 +129,11 @@
end while MU::MommaCat.deploy_exists?(deploy_id) or seed == "mu" or seed[0] == seed[1]
MU.setVar("deploy_id", deploy_id)
MU.setVar("appname", @appname.upcase)
MU.setVar("environment", @environment.upcase)
MU.setVar("timestamp", @timestamp)
+ MU.setVar("mommacat", @mommacat)
MU.setVar("seed", seed)
MU.setVar("handle", MU::MommaCat.generateHandle(seed))
MU.log "Deployment id: #{MU.appname} \"#{MU.handle}\" (#{MU.deploy_id})"
end
@@ -618,11 +619,10 @@
MU.log "Launching thread #{threadname}", MU::DEBUG
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)
- if @updating
- raise MuError, "Failed to findLitterMate(type: #{myservice["#MU_CLOUDCLASS"].cfg_plural}, name: #{myservice['name']}, credentials: #{myservice['credentials']}, created_only: true, return_all: false) in deploy #{@mommacat.deploy_id}" if !ext_obj
+ if @updating and ext_obj
ext_obj.config!(myservice)
end
myservice['#MUOBJECT'] = ext_obj
end
myservice['#MUOBJECT'] ||= myservice["#MU_CLOUDCLASS"].new(mommacat: @mommacat, kitten_cfg: myservice, delayed_save: @updating)