feat(deisctl): add support for swarm scheduler components

fix(swarm): change swarm binary path in swarm.go

ref(swarm): refactor code

fix(test): add /deis/scheduler directory in controller functional test

Author: Sivaram Mothiki

scheduler/swarm.py

@@ -35,31 +35,27 @@ def create(self, name, image, command='', template=None, **kwargs):
         self.docker_cli.create_container(image=cimage, name=name,
                                          command=command.encode('utf-8'), mem_limit=mem,
                                          cpu_shares=cpu,
-                                         environment=[affinity])
-        self.docker_cli.stop(name)
+                                         environment=[affinity],
+                                         host_config={'PublishAllPorts': True})
 
     def start(self, name):
         """
         Start a container
         """
-        self.docker_cli.start(name, publish_all_ports=True)
-
-        return
+        self.docker_cli.start(name)
 
     def stop(self, name):
         """
         Stop a container
         """
         self.docker_cli.stop(name)
-        return
 
     def destroy(self, name):
         """
         Destroy a container
         """
         self.stop(name)
         self.docker_cli.remove_container(name)
-        return
 
     def run(self, name, image, entrypoint, command):
         """
@@ -97,20 +93,13 @@ def _get_container_state(self, name):
 
     def state(self, name):
         try:
-            # NOTE (bacongobbler): this call to ._get_unit() acts as a pre-emptive check to
-            # determine if the job no longer exists (will raise a RuntimeError on 404)
             for _ in range(30):
                 return self._get_container_state(name)
                 time.sleep(1)
-            # FIXME (bacongobbler): when fleet loads a job, sometimes it'll automatically start and
-            # stop the container, which in our case will return as 'failed', even though
-            # the container is perfectly fine.
+            # FIXME (smothiki): should be able to send JobState.crashed
         except KeyError:
-            # failed retrieving a proper response from the fleet API
             return JobState.error
         except RuntimeError:
-            # failed to retrieve a response from the fleet API,
-            # which means it does not exist
             return JobState.destroyed
 
     def attach(self, name):

templates/confd_settings.py

@@ -12,8 +12,6 @@
 
 # scheduler swarm manager host
 SWARM_HOST = '{{ if exists "/deis/scheduler/swarm/host" }}{{ getv "/deis/scheduler/swarm/host" }}{{ else }}127.0.0.1{{ end }}'
-#SWARM_HOST = '{{ or (.deis_scheduler_swarm_host) "127.0.0.1" }}'
-
 
 # base64-encoded SSH private key to facilitate current version of "deis run"
 SSH_PRIVATE_KEY = """{{ if exists "/deis/platform/sshPrivateKey" }}{{ getv "/deis/platform/sshPrivateKey" }}{{ else }}""{{end}}"""

tests/controller_test.go

@@ -24,6 +24,7 @@ func TestController(t *testing.T) {
 		"/deis/database",
 		"/deis/registry",
 		"/deis/domains",
+		"/deis/scheduler",
 	}
 	tag, etcdPort := utils.BuildTag(), utils.RandomPort()
 	imageName := utils.ImagePrefix() + "controller" + ":" + tag