Merge branch 'master' into openstack

Author: David Chung

Makefile

@@ -14,8 +14,8 @@ E2E_TESTS?=true
 #Source file target
 SRCS  := $(shell find . -type f -name '*.go')
 
-# Set the go build tags here.  By default we disable building of libvirt
-GO_BUILD_TAGS?=nolibvirt
+# Set the go build tags here.  By default we disable building of libvirt and ucs.  Must be space-separated.
+GO_BUILD_TAGS?='nolibvirt noucs'
 
 # Allow turning off function inlining and variable registerization
 ifeq (${DISABLE_OPTIMIZATION},true)

cmd/group/README.md

@@ -15,6 +15,14 @@ The plugin may be started without any arguments and will default to using unix s
 `~/.infrakit/plugins` for communications with the CLI and other plugins:
 
 ```shell
-$ build/infrakit-group-default
-INFO[0000] Listening at: ~/.infrakit/plugins/group
+$ b$ build/infrakit plugin start group
+INFO[11-06|16:58:10] config                                   module=cli/plugin url= fn=github.com/docker/infrakit/cmd/infrakit/plugin.Command.func2
+INFO[11-06|16:58:10] Launching                                module=cli/plugin kind=group name=group-stateless fn=github.com/docker/infrakit/cmd/infrakit/plugin.Command.func2
+INFO[11-06|16:58:10] Starting plugin                          module=core/launch executor=inproc key=group name=group-stateless exec=inproc fn=github.com/docker/infrakit/pkg/launch.(*Monitor).Start.func1
+INFO[11-06|16:58:10] Object is an event producer              module=rpc/server object=&{keyed:0xc4201862f8} discover=/Users/infrakit/.infrakit/plugins/group-stateless fn=github.com/docker/infrakit/pkg/rpc/server.startAtPath
+INFO[11-06|16:58:10] Listening                                module=rpc/server discover=/Users/infrakit/.infrakit/plugins/group-stateless fn=github.com/docker/infrakit/pkg/rpc/server.startAtPath
+INFO[11-06|16:58:10] Waiting for startup                      module=core/launch key=group name=group-stateless config="{\n\"Kind\": \"group\",\n\"Options\": {\n\"PollInterval\": \"10s\",\n\"MaxParallelNum\": 0,\n\"PollIntervalGroupSpec\": \"10s\",\n\"PollIntervalGroupDetail\": \"10s\"\n}\n}" as=group-stateless fn=github.com/docker/infrakit/pkg/launch.(*Monitor).Start.func1
+INFO[11-06|16:58:10] Done waiting on plugin starts            module=cli/plugin fn=github.com/docker/infrakit/cmd/infrakit/plugin.Command.func2
+INFO[11-06|16:58:10] PID file created                         module=run path=/Users/infrakit/.infrakit/plugins/group-stateless.pid fn=github.com/docker/infrakit/pkg/run.run.func1
+INFO[11-06|16:58:10] Server started                           module=run discovery=/Users/infrakit/.infrakit/plugins/group-stateless fn=github.com/docker/infrakit/pkg/run.run.func1
 ```

cmd/infrakit/main.go

@@ -64,7 +64,6 @@ import (
 	_ "github.com/docker/infrakit/pkg/run/v0/tailer"
 	_ "github.com/docker/infrakit/pkg/run/v0/terraform"
 	_ "github.com/docker/infrakit/pkg/run/v0/time"
-	_ "github.com/docker/infrakit/pkg/run/v0/ucs"
 	_ "github.com/docker/infrakit/pkg/run/v0/vagrant"
 	_ "github.com/docker/infrakit/pkg/run/v0/vanilla"
 	_ "github.com/docker/infrakit/pkg/run/v0/vars"

cmd/infrakit/ucs.go

@@ -0,0 +1,7 @@
+// +build ucs
+
+package main
+
+import (
+	_ "github.com/docker/infrakit/pkg/run/v0/ucs"
+)