@@ -179,14 +179,14 @@ def __str__(self):
179179 def url (self ):
180180 return self .id + '.' + settings .DEIS_DOMAIN
181181
182- def _get_job_id (self ,container_type ):
182+ def _get_job_id (self , container_type ):
183183 app = self .id
184184 release = self .release_set .latest ()
185185 version = "v{}" .format (release .version )
186186 job_id = "{app}_{version}.{container_type}" .format (** locals ())
187187 return job_id
188188
189- def _get_command (self ,container_type ):
189+ def _get_command (self , container_type ):
190190 try :
191191 # if this is not procfile-based app, ensure they cannot break out
192192 # and run arbitrary commands on the host
@@ -294,9 +294,9 @@ def scale(self, user, structure): # noqa
294294 diff -= 1
295295
296296 if changed :
297- if "scale" in dir (self ._scheduler ) :
298- self ._scale_containers (scale_types ,to_remove )
299- else :
297+ if "scale" in dir (self ._scheduler ):
298+ self ._scale_containers (scale_types , to_remove )
299+ else :
300300 if to_add :
301301 self ._start_containers (to_add )
302302 if to_remove :
@@ -310,9 +310,9 @@ def scale(self, user, structure): # noqa
310310 self .save ()
311311 return changed
312312
313- def _scale_containers (self ,scale_types ,to_remove ) :
313+ def _scale_containers (self , scale_types , to_remove ):
314314 release = self .release_set .latest ()
315- for scale_type in scale_types :
315+ for scale_type in scale_types :
316316 image = release .image
317317 version = "v{}" .format (release .version )
318318 kwargs = {'memory' : release .config .memory ,
@@ -389,16 +389,15 @@ def deploy(self, user, release):
389389 existing = self .container_set .exclude (type = 'run' )
390390 new = []
391391 scale_types = set ()
392- old_name = ''
393392 for e in existing :
394393 n = e .clone (release )
395394 n .save ()
396395 new .append (n )
397396 scale_types .add (e .type )
398397
399- if new and "deploy" in dir (self ._scheduler ) :
400- self ._deploy_app (scale_types ,release ,existing )
401- else :
398+ if new and "deploy" in dir (self ._scheduler ):
399+ self ._deploy_app (scale_types , release , existing )
400+ else :
402401 self ._start_containers (new )
403402
404403 # destroy old containers
@@ -409,16 +408,16 @@ def deploy(self, user, release):
409408 if self .structure == {} and release .build is not None :
410409 self ._default_scale (user , release )
411410
412- def _deploy_app (self ,scale_types ,release ,existing ) :
413- for scale_type in scale_types :
411+ def _deploy_app (self , scale_types , release , existing ):
412+ for scale_type in scale_types :
414413 image = release .image
415414 version = "v{}" .format (release .version )
416415 kwargs = {'memory' : release .config .memory ,
417416 'cpu' : release .config .cpu ,
418417 'tags' : release .config .tags ,
419418 'aname' : self .id ,
420419 'num' : 0 ,
421- 'version' :version }
420+ 'version' : version }
422421 job_id = self ._get_job_id (scale_type )
423422 command = self ._get_command (scale_type )
424423 try :
0 commit comments