Merge pull request #3736 from bacongobbler/controller-remove-initial-arg

ref(controller): remove initial from .deploy()

Author: Matthew Fisher

controller/api/models.py

@@ -329,7 +329,7 @@ def _destroy_containers(self, to_destroy):
             log_event(self, err, logging.ERROR)
             raise RuntimeError(err)
 
-    def deploy(self, user, release, initial=False):
+    def deploy(self, user, release):
         """Deploy a new release to this application"""
         existing = self.container_set.exclude(type='run')
         new = []
@@ -345,7 +345,7 @@ def deploy(self, user, release, initial=False):
             self._destroy_containers(existing)
 
         # perform default scaling if necessary
-        if initial:
+        if self.structure == {} and release.build is not None:
             self._default_scale(user, release)
 
     def _default_scale(self, user, release):
@@ -604,9 +604,8 @@ def create(self, user, *args, **kwargs):
                                          build=self,
                                          config=latest_release.config,
                                          source_version=source_version)
-        initial = True if self.app.structure == {} else False
         try:
-            self.app.deploy(user, new_release, initial=initial)
+            self.app.deploy(user, new_release)
             return new_release
         except RuntimeError:
             new_release.delete()