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

builder/image/bin/boot

@@ -66,7 +66,7 @@ DOCKER_PID=$!
 
 # wait for docker to start
 while [[ ! -e /var/run/docker.sock ]]; do
-	sleep 1
+  sleep 1
 done
 
 # build required images

contrib/coreos/user-data.example

@@ -126,7 +126,7 @@ write_files:
     content: |
         [Service]
         EnvironmentFile=/etc/environment_proxy
-        Environment="DOCKER_OPTS=--insecure-registry 10.0.0.0/8 --insecure-registry 172.16.0.0/12 --insecure-registry 192.168.0.0/16 --insecure-registry 100.64.0.0/10 "
+        Environment="DOCKER_OPTS=--insecure-registry 10.0.0.0/8 --insecure-registry 172.16.0.0/12 --insecure-registry 192.168.0.0/16 --insecure-registry 100.64.0.0/10"
   - path: /run/deis/bin/get_image
     permissions: '0755'
     content: |

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

controller/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}}"""

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

deisctl/cmd/cmd.go

@@ -23,6 +23,7 @@ import (
 const (
 	// PlatformCommand is shorthand for "all the Deis components."
 	PlatformCommand string = "platform"
+	swarm           string = "swarm"
 )
 
 // ListUnits prints a list of installed units.
@@ -100,10 +101,14 @@ Usage:
 	// if target is platform, install all services
 	targets := args["<target>"].([]string)
 
-	if len(targets) == 1 && targets[0] == PlatformCommand {
-		return StartPlatform(b)
+	if len(targets) == 1 {
+		if targets[0] == PlatformCommand {
+			return StartPlatform(b)
+		}
+		if targets[0] == swarm {
+			return StartSwarm(b)
+		}
 	}
-
 	outchan := make(chan string)
 	errchan := make(chan error)
 	var wg sync.WaitGroup
@@ -132,28 +137,6 @@ deisctl config platform set sshPrivateKey=<path-to-key>
 	return nil
 }
 
-// StartPlatform activates all components.
-func StartPlatform(b backend.Backend) error {
-
-	outchan := make(chan string)
-	errchan := make(chan error)
-	var wg sync.WaitGroup
-
-	go printState(outchan, errchan, 500*time.Millisecond)
-
-	outchan <- utils.DeisIfy("Starting Deis...")
-
-	startDefaultServices(b, &wg, outchan, errchan)
-
-	wg.Wait()
-	close(outchan)
-
-	fmt.Println("Done.")
-	fmt.Println()
-	fmt.Println("Please use `deis register` to setup an administrator account.")
-	return nil
-}
-
 func startDefaultServices(b backend.Backend, wg *sync.WaitGroup, outchan chan string, errchan chan error) {
 
 	// create separate channels for background tasks
@@ -218,8 +201,13 @@ Usage:
 	targets := args["<target>"].([]string)
 
 	// if target is platform, stop all services
-	if len(targets) == 1 && targets[0] == PlatformCommand {
-		return StopPlatform(b)
+	if len(targets) == 1 {
+		if targets[0] == PlatformCommand {
+			return StopPlatform(b)
+		}
+		if targets[0] == swarm {
+			return StopSwarm(b)
+		}
 	}
 
 	outchan := make(chan string)
@@ -235,28 +223,6 @@ Usage:
 	return nil
 }
 
-// StopPlatform deactivates all components.
-func StopPlatform(b backend.Backend) error {
-
-	outchan := make(chan string)
-	errchan := make(chan error)
-	var wg sync.WaitGroup
-
-	go printState(outchan, errchan, 500*time.Millisecond)
-
-	outchan <- utils.DeisIfy("Stopping Deis...")
-
-	stopDefaultServices(b, &wg, outchan, errchan)
-
-	wg.Wait()
-	close(outchan)
-
-	fmt.Println("Done.")
-	fmt.Println()
-	fmt.Println("Please run `deisctl start platform` to restart Deis.")
-	return nil
-}
-
 func stopDefaultServices(b backend.Backend, wg *sync.WaitGroup, outchan chan string, errchan chan error) {
 
 	outchan <- fmt.Sprintf("Routing mesh...")
@@ -372,12 +338,16 @@ Usage:
 		return err
 	}
 
-	// if target is platform, install all services
 	targets := args["<target>"].([]string)
-	if len(targets) == 1 && targets[0] == PlatformCommand {
-		return InstallPlatform(b)
+	// if target is platform, install all services
+	if len(targets) == 1 {
+		if targets[0] == PlatformCommand {
+			return InstallPlatform(b)
+		}
+		if targets[0] == swarm {
+			return InstallSwarm(b)
+		}
 	}
-
 	outchan := make(chan string)
 	errchan := make(chan error)
 	var wg sync.WaitGroup
@@ -392,33 +362,6 @@ Usage:
 	return nil
 }
 
-// InstallPlatform loads all components' definitions from local unit files.
-// After InstallPlatform, all components will be available for StartPlatform.
-func InstallPlatform(b backend.Backend) error {
-
-	if err := checkRequiredKeys(); err != nil {
-		return err
-	}
-
-	outchan := make(chan string)
-	errchan := make(chan error)
-	var wg sync.WaitGroup
-
-	go printState(outchan, errchan, 500*time.Millisecond)
-
-	outchan <- utils.DeisIfy("Installing Deis...")
-
-	installDefaultServices(b, &wg, outchan, errchan)
-
-	wg.Wait()
-	close(outchan)
-
-	fmt.Println("Done.")
-	fmt.Println()
-	fmt.Println("Please run `deisctl start platform` to boot up Deis.")
-	return nil
-}
-
 func installDefaultServices(b backend.Backend, wg *sync.WaitGroup, outchan chan string, errchan chan error) {
 
 	outchan <- fmt.Sprintf("Storage subsystem...")
@@ -460,8 +403,13 @@ Usage:
 
 	// if target is platform, uninstall all services
 	targets := args["<target>"].([]string)
-	if len(targets) == 1 && targets[0] == PlatformCommand {
-		return UninstallPlatform(b)
+	if len(targets) == 1 {
+		if targets[0] == PlatformCommand {
+			return UninstallPlatform(b)
+		}
+		if targets[0] == swarm {
+			return UnInstallSwarm(b)
+		}
 	}
 
 	outchan := make(chan string)
@@ -478,27 +426,6 @@ Usage:
 	return nil
 }
 
-// UninstallPlatform unloads all components' definitions.
-// After UninstallPlatform, all components will be unavailable.
-func UninstallPlatform(b backend.Backend) error {
-
-	outchan := make(chan string)
-	errchan := make(chan error)
-	var wg sync.WaitGroup
-
-	go printState(outchan, errchan, 500*time.Millisecond)
-
-	outchan <- utils.DeisIfy("Uninstalling Deis...")
-
-	uninstallAllServices(b, &wg, outchan, errchan)
-
-	wg.Wait()
-	close(outchan)
-
-	fmt.Println("Done.")
-	return nil
-}
-
 func uninstallAllServices(b backend.Backend, wg *sync.WaitGroup, outchan chan string, errchan chan error) error {
 
 	outchan <- fmt.Sprintf("Routing mesh...")

deisctl/cmd/platform.go

@@ -0,0 +1,102 @@
+package cmd
+
+import (
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/deis/deis/deisctl/backend"
+	"github.com/deis/deis/deisctl/utils"
+)
+
+// InstallPlatform loads all components' definitions from local unit files.
+// After InstallPlatform, all components will be available for StartPlatform.
+func InstallPlatform(b backend.Backend) error {
+
+	if err := checkRequiredKeys(); err != nil {
+		return err
+	}
+
+	outchan := make(chan string)
+	errchan := make(chan error)
+	var wg sync.WaitGroup
+
+	go printState(outchan, errchan, 500*time.Millisecond)
+
+	outchan <- utils.DeisIfy("Installing Deis...")
+
+	installDefaultServices(b, &wg, outchan, errchan)
+
+	wg.Wait()
+	close(outchan)
+
+	fmt.Println("Done.")
+	fmt.Println()
+	fmt.Println("Please run `deisctl start platform` to boot up Deis.")
+	return nil
+}
+
+// StartPlatform activates all components.
+func StartPlatform(b backend.Backend) error {
+
+	outchan := make(chan string)
+	errchan := make(chan error)
+	var wg sync.WaitGroup
+
+	go printState(outchan, errchan, 500*time.Millisecond)
+
+	outchan <- utils.DeisIfy("Starting Deis...")
+
+	startDefaultServices(b, &wg, outchan, errchan)
+
+	wg.Wait()
+	close(outchan)
+
+	fmt.Println("Done.")
+	fmt.Println()
+	fmt.Println("Please use `deis register` to setup an administrator account.")
+	return nil
+}
+
+// StopPlatform deactivates all components.
+func StopPlatform(b backend.Backend) error {
+
+	outchan := make(chan string)
+	errchan := make(chan error)
+	var wg sync.WaitGroup
+
+	go printState(outchan, errchan, 500*time.Millisecond)
+
+	outchan <- utils.DeisIfy("Stopping Deis...")
+
+	stopDefaultServices(b, &wg, outchan, errchan)
+
+	wg.Wait()
+	close(outchan)
+
+	fmt.Println("Done.")
+	fmt.Println()
+	fmt.Println("Please run `deisctl start platform` to restart Deis.")
+	return nil
+}
+
+// UninstallPlatform unloads all components' definitions.
+// After UninstallPlatform, all components will be unavailable.
+func UninstallPlatform(b backend.Backend) error {
+
+	outchan := make(chan string)
+	errchan := make(chan error)
+	var wg sync.WaitGroup
+
+	go printState(outchan, errchan, 500*time.Millisecond)
+
+	outchan <- utils.DeisIfy("Uninstalling Deis...")
+
+	uninstallAllServices(b, &wg, outchan, errchan)
+
+	wg.Wait()
+	close(outchan)
+
+	fmt.Println("Done.")
+	return nil
+}