coreos-cloudinit: bump to 0.11.4

Merge pull request #266 from crawford/config
config: update configs to match etcd, fleet, and flannel
2014-11-21 20:11:37 -08:00 · 2014-11-21 20:10:34 -08:00 · 2014-11-21 16:57:00 -08:00 · 2014-11-21 16:57:00 -08:00 · 2014-11-21 16:57:00 -08:00 · 2014-11-21 16:13:49 -08:00
216 changed files with 5651 additions and 3204 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ go:

 install:
 - go get code.google.com/p/go.tools/cmd/cover
+ - go get code.google.com/p/go.tools/cmd/vet

 script:
 - ./test
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,22 +39,25 @@ Thanks for your contributions!

 ### Format of the Commit Message

-We follow a rough convention for commit messages borrowed from AngularJS. This
-is an example of a commit:
+We follow a rough convention for commit messages that is designed to answer two
+questions: what changed and why. The subject line should feature the what and
+the body of the commit should describe the why.

 ```
-    feat(scripts/test-cluster): add a cluster test command
+environment: write new keys in consistent order

-    this uses tmux to setup a test cluster that you can easily kill and
-    start for debugging.
+Go 1.3 randomizes the ordering of keys when iterating over a map.
+Sort the keys to make this ordering consistent.
+
+Fixes #38
 ```

 The format can be described more formally as follows:

 ```
-<type>(<scope>): <subject>
+<subsystem>: <what changed>
 <BLANK LINE>
-<body>
+<why this change was made>
 <BLANK LINE>
 <footer>
 ```
@@ -63,25 +66,3 @@ The first line is the subject and should be no longer than 70 characters, the
 second line is always blank, and other lines should be wrapped at 80 characters.
 This allows the message to be easier to read on GitHub as well as in various
 git tools.
-
-#### Subject Line
-
-The subject line contains a succinct description of the change.
-
-#### Allowed `<type>`s
- *feat* (feature)
- *fix* (bug fix)
- *docs* (documentation)
- *style* (formatting, missing semi colons, …)
- *refactor*
- *test* (when adding missing tests)
- *chore* (maintain)
-
-#### Allowed `<scope>`s
-
-Scopes can anything specifying the place of the commit change in the code base - 
-for example, "api", "store", etc.
-
-
-For more details on the commit format, see the [AngularJS commit style
-guide](https://docs.google.com/a/coreos.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#).
--- a/Documentation/cloud-config.md
+++ b/Documentation/cloud-config.md
@@ -4,7 +4,7 @@ CoreOS allows you to declaratively customize various OS-level items, such as net

 ## Configuration File

-The file used by this system initialization program is called a "cloud-config" file. It is inspired by the [cloud-init][cloud-init] project's [cloud-config][cloud-config] file. which is "the defacto multi-distribution package that handles early initialization of a cloud instance" ([cloud-init docs][cloud-init-docs]). Because the cloud-init project includes tools which aren't used by CoreOS, only the relevant subset of its configuration items will be implemented in our cloud-config file. In addition to those, we added a few CoreOS-specific items, such as etcd configuration, OEM definition, and systemd units.
+The file used by this system initialization program is called a "cloud-config" file. It is inspired by the [cloud-init][cloud-init] project's [cloud-config][cloud-config] file, which is "the defacto multi-distribution package that handles early initialization of a cloud instance" ([cloud-init docs][cloud-init-docs]). Because the cloud-init project includes tools which aren't used by CoreOS, only the relevant subset of its configuration items will be implemented in our cloud-config file. In addition to those, we added a few CoreOS-specific items, such as etcd configuration, OEM definition, and systemd units.

 We've designed our implementation to allow the same cloud-config file to work across all of our supported platforms.

@@ -68,7 +68,7 @@ Environment="ETCD_PEER_ADDR=192.0.2.13:7001"
 For more information about the available configuration parameters, see the [etcd documentation][etcd-config].
 Note that hyphens in the coreos.etcd.* keys are mapped to underscores.

-_Note: The `$private_ipv4` and `$public_ipv4` substitution variables referenced in other documents are only supported on Amazon EC2, Google Compute Engine, OpenStack, Rackspace, and Vagrant._
+_Note: The `$private_ipv4` and `$public_ipv4` substitution variables referenced in other documents are only supported on Amazon EC2, Google Compute Engine, OpenStack, Rackspace, DigitalOcean, and Vagrant._

 [etcd-config]: https://github.com/coreos/etcd/blob/master/Documentation/configuration.md

@@ -95,7 +95,30 @@ Environment="FLEET_METADATA=region=us-west"

 For more information on fleet configuration, see the [fleet documentation][fleet-config].

-[fleet-config]: https://github.com/coreos/fleet/blob/master/Documentation/deployment-and-configuration.md
+[fleet-config]: https://github.com/coreos/fleet/blob/master/Documentation/deployment-and-configuration.md#configuration
+
+#### flannel
+
+The `coreos.flannel.*` parameters also work very similarly to `coreos.etcd.*` and `coreos.fleet.*`. They can be used to set enviornment variables for flanneld. Given the following cloud-config...
+
+```yaml
+#cloud-config
+
+coreos:
+    flannel:
+        etcd-prefix: /coreos.com/network2
+```
+
+...will generate systemd unit drop-in like so:
+
+```
+[Service]
+Environment="FLANNELD_ETCD_PREFIX=/coreos.com/network2"
+```
+
+For complete list of flannel configuraion parameters, see the [flannel documentation][flannel-readme].
+
+[flannel-readme]: https://github.com/coreos/flannel/blob/master/README.md

 #### update

@@ -130,11 +153,11 @@ The `coreos.units.*` parameters define a list of arbitrary systemd units to star
 Each item is an object with the following fields:

 - **name**: String representing unit's name. Required.
- **runtime**: Boolean indicating whether or not to persist the unit across reboots. This is analogous to the `--runtime` argument to `systemctl enable`. Default value is false.
- **enable**: Boolean indicating whether or not to handle the [Install] section of the unit file. This is similar to running `systemctl enable <name>`. Default value is false.
+- **runtime**: Boolean indicating whether or not to persist the unit across reboots. This is analogous to the `--runtime` argument to `systemctl enable`. The default value is false.
+- **enable**: Boolean indicating whether or not to handle the [Install] section of the unit file. This is similar to running `systemctl enable <name>`. The default value is false.
 - **content**: Plaintext string representing entire unit file. If no value is provided, the unit is assumed to exist already.
- **command**: Command to execute on unit: start, stop, reload, restart, try-restart, reload-or-restart, reload-or-try-restart. Default value is restart.
- **mask**: Whether to mask the unit file by symlinking it to `/dev/null` (analogous to `systemctl mask <name>`). Note that unlike `systemctl mask`, **this will destructively remove any existing unit file** located at `/etc/systemd/system/<unit>`, to ensure that the mask succeeds. Default value is false.
+- **command**: Command to execute on unit: start, stop, reload, restart, try-restart, reload-or-restart, reload-or-try-restart. The default behavior is to not execute any commands.
+- **mask**: Whether to mask the unit file by symlinking it to `/dev/null` (analogous to `systemctl mask <name>`). Note that unlike `systemctl mask`, **this will destructively remove any existing unit file** located at `/etc/systemd/system/<unit>`, to ensure that the mask succeeds. The default value is false.

 **NOTE:** The command field is ignored for all network, netdev, and link units. The systemd-networkd.service unit will be restarted in their place.

@@ -303,7 +326,7 @@ Each item in the list may have the following keys:

 - **path**: Absolute location on disk where contents should be written
 - **content**: Data to write at the provided `path`
- **permissions**: String representing file permissions in octal notation (i.e. '0644')
+- **permissions**: Integer representing file permissions, typically in octal notation (i.e. 0644)
 - **owner**: User and group that should own the file written to disk. This is equivalent to the `<user>:<group>` argument to `chown <user>:<group> <path>`.

 Explicitly not implemented is the **encoding** attribute.
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -0,0 +1,34 @@
+{
+	"ImportPath": "github.com/coreos/coreos-cloudinit",
+	"GoVersion": "go1.3.1",
+	"Packages": [
+		"./..."
+	],
+	"Deps": [
+		{
+			"ImportPath": "github.com/cloudsigma/cepgo",
+			"Rev": "1bfc4895bf5c4d3b599f3f6ee142299488c8739b"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-systemd/dbus",
+			"Rev": "4fbc5060a317b142e6c7bfbedb65596d5f0ab99b"
+		},
+		{
+			"ImportPath": "github.com/dotcloud/docker/pkg/netlink",
+			"Comment": "v0.11.1-359-g55d41c3e21e1",
+			"Rev": "55d41c3e21e1593b944c06196ffb2ac57ab7f653"
+		},
+		{
+			"ImportPath": "github.com/guelfey/go.dbus",
+			"Rev": "f6a3a2366cc39b8479cadc499d3c735fb10fbdda"
+		},
+		{
+			"ImportPath": "github.com/tarm/goserial",
+			"Rev": "cdabc8d44e8e84f58f18074ae44337e1f2f375b9"
+		},
+		{
+			"ImportPath": "gopkg.in/yaml.v1",
+			"Rev": "feb4ca79644e8e7e39c06095246ee54b1282c118"
+		}
+	]
+}
--- a/Godeps/Readme
+++ b/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
--- a/Godeps/_workspace/.gitignore
+++ b/Godeps/_workspace/.gitignore
@@ -0,0 +1,2 @@
+/pkg
+/bin
--- a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/.gitignore
+++ b/Godeps/_workspace/src/github.com/cloudsigma/cepgo/.gitignore
@@ -0,0 +1,23 @@
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
--- a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/LICENSE
+++ b/Godeps/_workspace/src/github.com/cloudsigma/cepgo/LICENSE
--- a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/README.md
+++ b/Godeps/_workspace/src/github.com/cloudsigma/cepgo/README.md
--- a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo.go
+++ b/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo.go
@@ -48,7 +48,7 @@ import (
 	"fmt"
 	"runtime"

-	"github.com/coreos/coreos-cloudinit/third_party/github.com/tarm/goserial"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/tarm/goserial"
 )

 const (
--- a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo_test.go
+++ b/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo_test.go
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"sync"

-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 )

 const signalBuffer = 100
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus_test.go
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go
@@ -18,7 +18,7 @@ package dbus

 import (
 	"errors"
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 )

 func (c *Conn) initJobs() {
@@ -208,7 +208,7 @@ func (c *Conn) SetUnitProperties(name string, runtime bool, properties ...Proper
 }

 func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) {
-	return c.getProperty(unit, "org.freedesktop.systemd1." + unitType, propertyName)
+	return c.getProperty(unit, "org.freedesktop.systemd1."+unitType, propertyName)
 }

 // ListUnits returns an array with all currently loaded units. Note that
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods_test.go
@@ -18,7 +18,7 @@ package dbus

 import (
 	"fmt"
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 	"math/rand"
 	"os"
 	"path/filepath"
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go
@@ -17,7 +17,7 @@ limitations under the License.
 package dbus

 import (
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 )

 // From the systemd docs:
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set_test.go
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"time"

-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 )

 const (
@@ -101,7 +101,7 @@ func (c *Conn) SubscribeUnits(interval time.Duration) (<-chan map[string]*UnitSt
 // SubscribeUnitsCustom is like SubscribeUnits but lets you specify the buffer
 // size of the channels, the comparison function for detecting changes and a filter
 // function for cutting down on the noise that your channel receives.
-func (c *Conn) SubscribeUnitsCustom(interval time.Duration, buffer int, isChanged func(*UnitStatus, *UnitStatus) bool, filterUnit func (string) bool) (<-chan map[string]*UnitStatus, <-chan error) {
+func (c *Conn) SubscribeUnitsCustom(interval time.Duration, buffer int, isChanged func(*UnitStatus, *UnitStatus) bool, filterUnit func(string) bool) (<-chan map[string]*UnitStatus, <-chan error) {
 	old := make(map[string]*UnitStatus)
 	statusChan := make(chan map[string]*UnitStatus, buffer)
 	errChan := make(chan error, buffer)
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set_test.go
--- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_test.go
+++ b/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_test.go
--- a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS
+++ b/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS
--- a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink.go
+++ b/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink.go
--- a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go
+++ b/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go
--- a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go
+++ b/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/LICENSE
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/LICENSE
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/README.markdown
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/README.markdown
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_external.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_external.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_sha1.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_sha1.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/call.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/call.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_darwin.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_darwin.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_other.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_other.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_test.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_test.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/dbus.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/dbus.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/decoder.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/decoder.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/doc.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/doc.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/encoder.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/encoder.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/examples_test.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/examples_test.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/export.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/export.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/call.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/call.go
@@ -2,7 +2,7 @@ package introspect

 import (
 	"encoding/xml"
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 	"strings"
 )

--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspect.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspect.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspectable.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspectable.go
@@ -2,7 +2,7 @@ package introspect

 import (
 	"encoding/xml"
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
 	"reflect"
 )

--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/message.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/message.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/prop/prop.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/prop/prop.go
@@ -3,8 +3,8 @@
 package prop

 import (
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus"
-	"github.com/coreos/coreos-cloudinit/third_party/github.com/guelfey/go.dbus/introspect"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect"
 	"sync"
 )

--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/proto_test.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/proto_test.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/sig.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/sig.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/sig_test.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/sig_test.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_darwin.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_darwin.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_generic.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_generic.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix_test.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix_test.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unixcred.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unixcred.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_lexer.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_lexer.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_parser.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_parser.go
--- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_test.go
+++ b/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_test.go
--- a/Godeps/_workspace/src/github.com/tarm/goserial/LICENSE
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/LICENSE
--- a/Godeps/_workspace/src/github.com/tarm/goserial/README.md
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/README.md
--- a/Godeps/_workspace/src/github.com/tarm/goserial/basic_test.go
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/basic_test.go
@@ -0,0 +1,61 @@
+package serial
+
+import (
+	"testing"
+	"time"
+)
+
+func TestConnection(t *testing.T) {
+	c0 := &Config{Name: "/dev/ttyUSB0", Baud: 115200}
+	c1 := &Config{Name: "/dev/ttyUSB1", Baud: 115200}
+
+	s1, err := OpenPort(c0)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	s2, err := OpenPort(c1)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ch := make(chan int, 1)
+	go func() {
+		buf := make([]byte, 128)
+		var readCount int
+		for {
+			n, err := s2.Read(buf)
+			if err != nil {
+				t.Fatal(err)
+			}
+			readCount++
+			t.Logf("Read %v %v bytes: % 02x %s", readCount, n, buf[:n], buf[:n])
+			select {
+			case <-ch:
+				ch <- readCount
+				close(ch)
+			default:
+			}
+		}
+	}()
+
+	if _, err = s1.Write([]byte("hello")); err != nil {
+		t.Fatal(err)
+	}
+	if _, err = s1.Write([]byte(" ")); err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(time.Second)
+	if _, err = s1.Write([]byte("world")); err != nil {
+		t.Fatal(err)
+	}
+	time.Sleep(time.Second / 10)
+
+	ch <- 0
+	s1.Write([]byte(" ")) // We could be blocked in the read without this
+	c := <-ch
+	exp := 5
+	if c >= exp {
+		t.Fatalf("Expected less than %v read, got %v", exp, c)
+	}
+}
--- a/Godeps/_workspace/src/github.com/tarm/goserial/serial.go
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/serial.go
--- a/Godeps/_workspace/src/github.com/tarm/goserial/serial_linux.go
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/serial_linux.go
--- a/Godeps/_workspace/src/github.com/tarm/goserial/serial_posix.go
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/serial_posix.go
--- a/Godeps/_workspace/src/github.com/tarm/goserial/serial_windows.go
+++ b/Godeps/_workspace/src/github.com/tarm/goserial/serial_windows.go
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml
@@ -1,3 +1,15 @@
+The following files were ported to Go from C files of libyaml, and thus
+are still covered by their original copyright and license:
+
+    apic.go
+    emitterc.go
+    parserc.go
+    readerc.go
+    scannerc.go
+    writerc.go
+    yamlh.go
+    yamlprivateh.go
+
 Copyright (c) 2006 Kirill Simonov

 Permission is hereby granted, free of charge, to any person obtaining a copy of
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/README.md
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/README.md
@@ -0,0 +1,128 @@
+# YAML support for the Go language
+
+Introduction
+------------
+
+The yaml package enables Go programs to comfortably encode and decode YAML
+values. It was developed within [Canonical](https://www.canonical.com) as
+part of the [juju](https://juju.ubuntu.com) project, and is based on a
+pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML)
+C library to parse and generate YAML data quickly and reliably.
+
+Compatibility
+-------------
+
+The yaml package is almost compatible with YAML 1.1, including support for
+anchors, tags, etc. There are still a few missing bits, such as document
+merging, base-60 floats (huh?), and multi-document unmarshalling. These
+features are not hard to add, and will be introduced as necessary.
+
+Installation and usage
+----------------------
+
+The import path for the package is *gopkg.in/yaml.v1*.
+
+To install it, run:
+
+    go get gopkg.in/yaml.v1
+
+API documentation
+-----------------
+
+If opened in a browser, the import path itself leads to the API documentation:
+
+  * [https://gopkg.in/yaml.v1](https://gopkg.in/yaml.v1)
+
+API stability
+-------------
+
+The package API for yaml v1 will remain stable as described in [gopkg.in](https://gopkg.in).
+
+
+License
+-------
+
+The yaml package is licensed under the LGPL with an exception that allows it to be linked statically. Please see the LICENSE file for details.
+
+
+Example
+-------
+
+```Go
+package main
+
+import (
+        "fmt"
+        "log"
+
+        "gopkg.in/yaml.v1"
+)
+
+var data = `
+a: Easy!
+b:
+  c: 2
+  d: [3, 4]
+`
+
+type T struct {
+        A string
+        B struct{C int; D []int ",flow"}
+}
+
+func main() {
+        t := T{}
+    
+        err := yaml.Unmarshal([]byte(data), &t)
+        if err != nil {
+                log.Fatalf("error: %v", err)
+        }
+        fmt.Printf("--- t:\n%v\n\n", t)
+    
+        d, err := yaml.Marshal(&t)
+        if err != nil {
+                log.Fatalf("error: %v", err)
+        }
+        fmt.Printf("--- t dump:\n%s\n\n", string(d))
+    
+        m := make(map[interface{}]interface{})
+    
+        err = yaml.Unmarshal([]byte(data), &m)
+        if err != nil {
+                log.Fatalf("error: %v", err)
+        }
+        fmt.Printf("--- m:\n%v\n\n", m)
+    
+        d, err = yaml.Marshal(&m)
+        if err != nil {
+                log.Fatalf("error: %v", err)
+        }
+        fmt.Printf("--- m dump:\n%s\n\n", string(d))
+}
+```
+
+This example will generate the following output:
+
+```
+--- t:
+{Easy! {2 [3 4]}}
+
+--- t dump:
+a: Easy!
+b:
+  c: 2
+  d: [3, 4]
+
+
+--- m:
+map[a:Easy! b:map[c:2 d:[3 4]]]
+
+--- m dump:
+a: Easy!
+b:
+  c: 2
+  d:
+  - 3
+  - 4
+```
+
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"io"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go
@@ -1,8 +1,9 @@
-package goyaml
+package yaml

 import (
 	"reflect"
 	"strconv"
+	"time"
 )

 const (
@@ -211,6 +212,16 @@ func newDecoder() *decoder {
 //   returned to call SetYAML() with the value of *out once it's defined.
 //
 func (d *decoder) setter(tag string, out *reflect.Value, good *bool) (set func()) {
+	if (*out).Kind() != reflect.Ptr && (*out).CanAddr() {
+		setter, _ := (*out).Addr().Interface().(Setter)
+		if setter != nil {
+			var arg interface{}
+			*out = reflect.ValueOf(&arg).Elem()
+			return func() {
+				*good = setter.SetYAML(tag, arg)
+			}
+		}
+	}
 	again := true
 	for again {
 		again = false
@@ -279,17 +290,20 @@ func (d *decoder) alias(n *node, out reflect.Value) (good bool) {
 	return good
 }

+var durationType = reflect.TypeOf(time.Duration(0))
+
 func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
 	var tag string
 	var resolved interface{}
 	if n.tag == "" && !n.implicit {
+		tag = "!!str"
 		resolved = n.value
 	} else {
 		tag, resolved = resolve(n.tag, n.value)
+	}
 	if set := d.setter(tag, &out, &good); set != nil {
 		defer set()
 	}
-	}
 	switch out.Kind() {
 	case reflect.String:
 		if resolved != nil {
@@ -320,6 +334,14 @@ func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
 				out.SetInt(int64(resolved))
 				good = true
 			}
+		case string:
+			if out.Type() == durationType {
+				d, err := time.ParseDuration(resolved)
+				if err == nil {
+					out.SetInt(int64(d))
+					good = true
+				}
+			}
 		}
 	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
 		switch resolved := resolved.(type) {
@@ -437,6 +459,10 @@ func (d *decoder) mapping(n *node, out reflect.Value) (good bool) {
 	}
 	l := len(n.children)
 	for i := 0; i < l; i += 2 {
+		if isMerge(n.children[i]) {
+			d.merge(n.children[i+1], out)
+			continue
+		}
 		k := reflect.New(kt).Elem()
 		if d.unmarshal(n.children[i], k) {
 			e := reflect.New(et).Elem()
@@ -456,7 +482,12 @@ func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
 	name := settableValueOf("")
 	l := len(n.children)
 	for i := 0; i < l; i += 2 {
-		if !d.unmarshal(n.children[i], name) {
+		ni := n.children[i]
+		if isMerge(ni) {
+			d.merge(n.children[i+1], out)
+			continue
+		}
+		if !d.unmarshal(ni, name) {
 			continue
 		}
 		if info, ok := sinfo.FieldsMap[name.String()]; ok {
@@ -471,3 +502,37 @@ func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
 	}
 	return true
 }
+
+func (d *decoder) merge(n *node, out reflect.Value) {
+	const wantMap = "map merge requires map or sequence of maps as the value"
+	switch n.kind {
+	case mappingNode:
+		d.unmarshal(n, out)
+	case aliasNode:
+		an, ok := d.doc.anchors[n.value]
+		if ok && an.kind != mappingNode {
+			panic(wantMap)
+		}
+		d.unmarshal(n, out)
+	case sequenceNode:
+		// Step backwards as earlier nodes take precedence.
+		for i := len(n.children)-1; i >= 0; i-- {
+			ni := n.children[i]
+			if ni.kind == aliasNode {
+				an, ok := d.doc.anchors[ni.value]
+				if ok && an.kind != mappingNode {
+					panic(wantMap)
+				}
+			} else if ni.kind != mappingNode {
+				panic(wantMap)
+			}
+			d.unmarshal(ni, out)
+		}
+	default:
+		panic(wantMap)
+	}
+}
+
+func isMerge(n *node) bool {
+	return n.kind == scalarNode && n.value == "<<" && (n.implicit == true || n.tag == "!!merge" || n.tag == "tag:yaml.org,2002:merge")
+}
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go
@@ -1,10 +1,11 @@
-package goyaml_test
+package yaml_test

 import (
-	. "launchpad.net/gocheck"
-	"github.com/coreos/coreos-cloudinit/third_party/launchpad.net/goyaml"
+	. "gopkg.in/check.v1"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/gopkg.in/yaml.v1"
 	"math"
 	"reflect"
+	"time"
 )

 var unmarshalIntTest = 123
@@ -350,6 +351,32 @@ var unmarshalTests = []struct {
 			C inlineB `yaml:",inline"`
 		}{1, inlineB{2, inlineC{3}}},
 	},
+
+	// bug 1243827
+	{
+		"a: -b_c",
+		map[string]interface{}{"a": "-b_c"},
+	},
+	{
+		"a: +b_c",
+		map[string]interface{}{"a": "+b_c"},
+	},
+	{
+		"a: 50cent_of_dollar",
+		map[string]interface{}{"a": "50cent_of_dollar"},
+	},
+
+	// Duration
+	{
+		"a: 3s",
+		map[string]time.Duration{"a": 3 * time.Second},
+	},
+
+	// Issue #24.
+	{
+		"a: <foo>",
+		map[string]string{"a": "<foo>"},
+	},
 }

 type inlineB struct {
@@ -377,7 +404,7 @@ func (s *S) TestUnmarshal(c *C) {
 			pv := reflect.New(pt.Elem())
 			value = pv.Interface()
 		}
-		err := goyaml.Unmarshal([]byte(item.data), value)
+		err := yaml.Unmarshal([]byte(item.data), value)
 		c.Assert(err, IsNil, Commentf("Item #%d", i))
 		if t.Kind() == reflect.String {
 			c.Assert(*value.(*string), Equals, item.value, Commentf("Item #%d", i))
@@ -389,7 +416,7 @@ func (s *S) TestUnmarshal(c *C) {

 func (s *S) TestUnmarshalNaN(c *C) {
 	value := map[string]interface{}{}
-	err := goyaml.Unmarshal([]byte("notanum: .NaN"), &value)
+	err := yaml.Unmarshal([]byte("notanum: .NaN"), &value)
 	c.Assert(err, IsNil)
 	c.Assert(math.IsNaN(value["notanum"].(float64)), Equals, true)
 }
@@ -408,7 +435,7 @@ var unmarshalErrorTests = []struct {
 func (s *S) TestUnmarshalErrors(c *C) {
 	for _, item := range unmarshalErrorTests {
 		var value interface{}
-		err := goyaml.Unmarshal([]byte(item.data), &value)
+		err := yaml.Unmarshal([]byte(item.data), &value)
 		c.Assert(err, ErrorMatches, item.error, Commentf("Partial unmarshal: %#v", value))
 	}
 }
@@ -421,6 +448,8 @@ var setterTests = []struct {
 	{"_: [1,A]", "!!seq", []interface{}{1, "A"}},
 	{"_: 10", "!!int", 10},
 	{"_: null", "!!null", nil},
+	{`_: BAR!`, "!!str", "BAR!"},
+	{`_: "BAR!"`, "!!str", "BAR!"},
 	{"_: !!foo 'BAR!'", "!!foo", "BAR!"},
 }

@@ -442,17 +471,31 @@ func (o *typeWithSetter) SetYAML(tag string, value interface{}) (ok bool) {
 	return true
 }

-type typeWithSetterField struct {
+type setterPointerType struct {
 	Field *typeWithSetter "_"
 }

-func (s *S) TestUnmarshalWithSetter(c *C) {
+type setterValueType struct {
+	Field typeWithSetter "_"
+}
+
+func (s *S) TestUnmarshalWithPointerSetter(c *C) {
 	for _, item := range setterTests {
-		obj := &typeWithSetterField{}
-		err := goyaml.Unmarshal([]byte(item.data), obj)
+		obj := &setterPointerType{}
+		err := yaml.Unmarshal([]byte(item.data), obj)
 		c.Assert(err, IsNil)
-		c.Assert(obj.Field, NotNil,
-			Commentf("Pointer not initialized (%#v)", item.value))
+		c.Assert(obj.Field, NotNil, Commentf("Pointer not initialized (%#v)", item.value))
+		c.Assert(obj.Field.tag, Equals, item.tag)
+		c.Assert(obj.Field.value, DeepEquals, item.value)
+	}
+}
+
+func (s *S) TestUnmarshalWithValueSetter(c *C) {
+	for _, item := range setterTests {
+		obj := &setterValueType{}
+		err := yaml.Unmarshal([]byte(item.data), obj)
+		c.Assert(err, IsNil)
+		c.Assert(obj.Field, NotNil, Commentf("Pointer not initialized (%#v)", item.value))
 		c.Assert(obj.Field.tag, Equals, item.tag)
 		c.Assert(obj.Field.value, DeepEquals, item.value)
 	}
@@ -460,7 +503,7 @@ func (s *S) TestUnmarshalWithSetter(c *C) {

 func (s *S) TestUnmarshalWholeDocumentWithSetter(c *C) {
 	obj := &typeWithSetter{}
-	err := goyaml.Unmarshal([]byte(setterTests[0].data), obj)
+	err := yaml.Unmarshal([]byte(setterTests[0].data), obj)
 	c.Assert(err, IsNil)
 	c.Assert(obj.tag, Equals, setterTests[0].tag)
 	value, ok := obj.value.(map[interface{}]interface{})
@@ -477,8 +520,8 @@ func (s *S) TestUnmarshalWithFalseSetterIgnoresValue(c *C) {
 	}()

 	m := map[string]*typeWithSetter{}
-	data := "{abc: 1, def: 2, ghi: 3, jkl: 4}"
-	err := goyaml.Unmarshal([]byte(data), m)
+	data := `{abc: 1, def: 2, ghi: 3, jkl: 4}`
+	err := yaml.Unmarshal([]byte(data), m)
 	c.Assert(err, IsNil)
 	c.Assert(m["abc"], NotNil)
 	c.Assert(m["def"], IsNil)
@@ -489,6 +532,98 @@ func (s *S) TestUnmarshalWithFalseSetterIgnoresValue(c *C) {
 	c.Assert(m["ghi"].value, Equals, 3)
 }

+// From http://yaml.org/type/merge.html
+var mergeTests = `
+anchors:
+  - &CENTER { "x": 1, "y": 2 }
+  - &LEFT   { "x": 0, "y": 2 }
+  - &BIG    { "r": 10 }
+  - &SMALL  { "r": 1 }
+
+# All the following maps are equal:
+
+plain:
+  # Explicit keys
+  "x": 1
+  "y": 2
+  "r": 10
+  label: center/big
+
+mergeOne:
+  # Merge one map
+  << : *CENTER
+  "r": 10
+  label: center/big
+
+mergeMultiple:
+  # Merge multiple maps
+  << : [ *CENTER, *BIG ]
+  label: center/big
+
+override:
+  # Override
+  << : [ *BIG, *LEFT, *SMALL ]
+  "x": 1
+  label: center/big
+
+shortTag:
+  # Explicit short merge tag
+  !!merge "<<" : [ *CENTER, *BIG ]
+  label: center/big
+
+longTag:
+  # Explicit merge long tag
+  !<tag:yaml.org,2002:merge> "<<" : [ *CENTER, *BIG ]
+  label: center/big
+
+inlineMap:
+  # Inlined map 
+  << : {"x": 1, "y": 2, "r": 10}
+  label: center/big
+
+inlineSequenceMap:
+  # Inlined map in sequence
+  << : [ *CENTER, {"r": 10} ]
+  label: center/big
+`
+
+func (s *S) TestMerge(c *C) {
+	var want = map[interface{}]interface{}{
+		"x":     1,
+		"y":     2,
+		"r":     10,
+		"label": "center/big",
+	}
+
+	var m map[string]interface{}
+	err := yaml.Unmarshal([]byte(mergeTests), &m)
+	c.Assert(err, IsNil)
+	for name, test := range m {
+		if name == "anchors" {
+			continue
+		}
+		c.Assert(test, DeepEquals, want, Commentf("test %q failed", name))
+	}
+}
+
+func (s *S) TestMergeStruct(c *C) {
+	type Data struct {
+		X, Y, R int
+		Label   string
+	}
+	want := Data{1, 2, 10, "center/big"}
+
+	var m map[string]Data
+	err := yaml.Unmarshal([]byte(mergeTests), &m)
+	c.Assert(err, IsNil)
+	for name, test := range m {
+		if name == "anchors" {
+			continue
+		}
+		c.Assert(test, Equals, want, Commentf("test %q failed", name))
+	}
+}
+
 //var data []byte
 //func init() {
 //	var err error
@@ -502,7 +637,7 @@ func (s *S) TestUnmarshalWithFalseSetterIgnoresValue(c *C) {
 //	var err error
 //	for i := 0; i < c.N; i++ {
 //		var v map[string]interface{}
-//		err = goyaml.Unmarshal(data, &v)
+//		err = yaml.Unmarshal(data, &v)
 //	}
 //	if err != nil {
 //		panic(err)
@@ -511,9 +646,9 @@ func (s *S) TestUnmarshalWithFalseSetterIgnoresValue(c *C) {
 //
 //func (s *S) BenchmarkMarshal(c *C) {
 //	var v map[string]interface{}
-//	goyaml.Unmarshal(data, &v)
+//	yaml.Unmarshal(data, &v)
 //	c.ResetTimer()
 //	for i := 0; i < c.N; i++ {
-//		goyaml.Marshal(&v)
+//		yaml.Marshal(&v)
 //	}
 //}
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"bytes"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go
@@ -1,9 +1,10 @@
-package goyaml
+package yaml

 import (
 	"reflect"
 	"sort"
 	"strconv"
+	"time"
 )

 type encoder struct {
@@ -85,7 +86,11 @@ func (e *encoder) marshal(tag string, in reflect.Value) {
 	case reflect.String:
 		e.stringv(tag, in)
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		if in.Type() == durationType {
+			e.stringv(tag, reflect.ValueOf(in.Interface().(time.Duration).String()))
+		} else {
 			e.intv(tag, in)
+		}
 	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
 		e.uintv(tag, in)
 	case reflect.Float32, reflect.Float64:
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go
@@ -1,12 +1,13 @@
-package goyaml_test
+package yaml_test

 import (
 	"fmt"
-	. "launchpad.net/gocheck"
-	"github.com/coreos/coreos-cloudinit/third_party/launchpad.net/goyaml"
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/gopkg.in/yaml.v1"
+	. "gopkg.in/check.v1"
 	"math"
 	"strconv"
 	"strings"
+	"time"
 )

 var marshalIntTest = 123
@@ -212,11 +213,23 @@ var marshalTests = []struct {
 		}{1, inlineB{2, inlineC{3}}},
 		"a: 1\nb: 2\nc: 3\n",
 	},
+
+	// Duration
+	{
+		map[string]time.Duration{"a": 3 * time.Second},
+		"a: 3s\n",
+	},
+
+	// Issue #24.
+	{
+		map[string]string{"a": "<foo>"},
+		"a: <foo>\n",
+	},
 }

 func (s *S) TestMarshal(c *C) {
 	for _, item := range marshalTests {
-		data, err := goyaml.Marshal(item.value)
+		data, err := yaml.Marshal(item.value)
 		c.Assert(err, IsNil)
 		c.Assert(string(data), Equals, item.data)
 	}
@@ -237,7 +250,7 @@ var marshalErrorTests = []struct {

 func (s *S) TestMarshalErrors(c *C) {
 	for _, item := range marshalErrorTests {
-		_, err := goyaml.Marshal(item.value)
+		_, err := yaml.Marshal(item.value)
 		c.Assert(err, ErrorMatches, item.error)
 	}
 }
@@ -269,12 +282,12 @@ func (s *S) TestMarshalTypeCache(c *C) {
 	var err error
 	func() {
 		type T struct{ A int }
-		data, err = goyaml.Marshal(&T{})
+		data, err = yaml.Marshal(&T{})
 		c.Assert(err, IsNil)
 	}()
 	func() {
 		type T struct{ B int }
-		data, err = goyaml.Marshal(&T{})
+		data, err = yaml.Marshal(&T{})
 		c.Assert(err, IsNil)
 	}()
 	c.Assert(string(data), Equals, "b: 0\n")
@@ -298,7 +311,7 @@ func (s *S) TestMashalWithGetter(c *C) {
 		obj := &typeWithGetterField{}
 		obj.Field.tag = item.tag
 		obj.Field.value = item.value
-		data, err := goyaml.Marshal(obj)
+		data, err := yaml.Marshal(obj)
 		c.Assert(err, IsNil)
 		c.Assert(string(data), Equals, string(item.data))
 	}
@@ -308,7 +321,7 @@ func (s *S) TestUnmarshalWholeDocumentWithGetter(c *C) {
 	obj := &typeWithGetter{}
 	obj.tag = ""
 	obj.value = map[string]string{"hello": "world!"}
-	data, err := goyaml.Marshal(obj)
+	data, err := yaml.Marshal(obj)
 	c.Assert(err, IsNil)
 	c.Assert(string(data), Equals, "hello: world!\n")
 }
@@ -356,7 +369,7 @@ func (s *S) TestSortedOutput(c *C) {
 	for _, k := range order {
 		m[k] = 1
 	}
-	data, err := goyaml.Marshal(m)
+	data, err := yaml.Marshal(m)
 	c.Assert(err, IsNil)
 	out := "\n" + string(data)
 	last := 0
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"bytes"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"io"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"math"
@@ -27,7 +27,6 @@ func init() {
 		t[int(c)] = 'M' // In map
 	}
 	t[int('.')] = '.' // Float (potentially in map)
-	t[int('<')] = '<' // Merge

 	var resolveMapList = []struct {
 		v   interface{}
@@ -45,6 +44,7 @@ func init() {
 		{math.Inf(+1), "!!float", []string{".inf", ".Inf", ".INF"}},
 		{math.Inf(+1), "!!float", []string{"+.inf", "+.Inf", "+.INF"}},
 		{math.Inf(-1), "!!float", []string{"-.inf", "-.Inf", "-.INF"}},
+		{"<<", "!!merge", []string{"<<"}},
 	}

 	m := resolveMap
@@ -113,13 +113,8 @@ func resolve(tag string, in string) (rtag string, out interface{}) {

 	case 'D', 'S':
 		// Int, float, or timestamp.
-		for i := 0; i != len(in); i++ {
-			if in[i] == '_' {
-				in = strings.Replace(in, "_", "", -1)
-				break
-			}
-		}
-		intv, err := strconv.ParseInt(in, 0, 64)
+		plain := strings.Replace(in, "_", "", -1)
+		intv, err := strconv.ParseInt(plain, 0, 64)
 		if err == nil {
 			if intv == int64(int(intv)) {
 				return "!!int", int(intv)
@@ -127,26 +122,23 @@ func resolve(tag string, in string) (rtag string, out interface{}) {
 				return "!!int", intv
 			}
 		}
-		floatv, err := strconv.ParseFloat(in, 64)
+		floatv, err := strconv.ParseFloat(plain, 64)
 		if err == nil {
 			return "!!float", floatv
 		}
-		if strings.HasPrefix(in, "0b") {
-			intv, err := strconv.ParseInt(in[2:], 2, 64)
+		if strings.HasPrefix(plain, "0b") {
+			intv, err := strconv.ParseInt(plain[2:], 2, 64)
 			if err == nil {
 				return "!!int", int(intv)
 			}
-		} else if strings.HasPrefix(in, "-0b") {
-			intv, err := strconv.ParseInt(in[3:], 2, 64)
+		} else if strings.HasPrefix(plain, "-0b") {
+			intv, err := strconv.ParseInt(plain[3:], 2, 64)
 			if err == nil {
 				return "!!int", -int(intv)
 			}
 		}
 	// XXX Handle timestamps here.

-	case '<':
-		// XXX Handle merge (<<) here.
-
 	default:
 		panic("resolveTable item not yet handled: " +
 			string([]byte{c}) + " (with " + in + ")")
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"bytes"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"reflect"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go
@@ -1,7 +1,7 @@
-package goyaml_test
+package yaml_test

 import (
-	. "launchpad.net/gocheck"
+	. "gopkg.in/check.v1"
 	"testing"
 )

--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 // Set the writer error and return false.
 func yaml_emitter_set_writer_error(emitter *yaml_emitter_t, problem string) bool {
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go
@@ -1,5 +1,10 @@
-// Package goyaml implements YAML support for the Go language.
-package goyaml
+// Package yaml implements YAML support for the Go language.
+//
+// Source code and other details for the project are available at GitHub:
+//
+//   https://github.com/go-yaml/yaml
+//
+package yaml

 import (
 	"errors"
@@ -28,32 +33,31 @@ func handleErr(err *error) {
 	}
 }

-// Objects implementing the goyaml.Setter interface will receive the YAML
-// tag and value via the SetYAML method during unmarshaling, rather than
-// being implicitly assigned by the goyaml machinery.  If setting the value
-// works, the method should return true.  If it returns false, the given
-// value will be omitted from maps and slices.
+// The Setter interface may be implemented by types to do their own custom
+// unmarshalling of YAML values, rather than being implicitly assigned by
+// the yaml package machinery. If setting the value works, the method should
+// return true.  If it returns false, the value is considered unsupported
+// and is omitted from maps and slices.
 type Setter interface {
 	SetYAML(tag string, value interface{}) bool
 }

-// Objects implementing the goyaml.Getter interface will get the GetYAML()
-// method called when goyaml is requested to marshal the given value, and
-// the result of this method will be marshaled in place of the actual object.
+// The Getter interface is implemented by types to do their own custom
+// marshalling into a YAML tag and value.
 type Getter interface {
 	GetYAML() (tag string, value interface{})
 }

 // Unmarshal decodes the first document found within the in byte slice
-// and assigns decoded values into the object pointed by out.
+// and assigns decoded values into the out value.
 //
-// Maps, pointers to structs and ints, etc, may all be used as out values.
-// If an internal pointer within a struct is not initialized, goyaml
-// will initialize it if necessary for unmarshalling the provided data,
-// but the struct provided as out must not be a nil pointer.
+// Maps and pointers (to a struct, string, int, etc) are accepted as out
+// values.  If an internal pointer within a struct is not initialized,
+// the yaml package will initialize it if necessary for unmarshalling
+// the provided data. The out parameter must not be nil.
 //
 // The type of the decoded values and the type of out will be considered,
-// and Unmarshal() will do the best possible job to unmarshal values
+// and Unmarshal will do the best possible job to unmarshal values
 // appropriately.  It is NOT considered an error, though, to skip values
 // because they are not available in the decoded YAML, or if they are not
 // compatible with the out value. To ensure something was properly
@@ -61,11 +65,11 @@ type Getter interface {
 // field (usually the zero value).
 //
 // Struct fields are only unmarshalled if they are exported (have an
-// upper case first letter), and will be unmarshalled using the field
-// name lowercased by default. When custom field names are desired, the
-// tag value may be used to tweak the name. Everything before the first
-// comma in the field tag will be used as the name. The values following
-// the comma are used to tweak the marshalling process (see Marshal).
+// upper case first letter), and are unmarshalled using the field name
+// lowercased as the default key. Custom keys may be defined via the
+// "yaml" name in the field tag: the content preceding the first comma
+// is used as the key, and the following comma-separated options are
+// used to tweak the marshalling process (see Marshal).
 // Conflicting names result in a runtime error.
 //
 // For example:
@@ -75,7 +79,7 @@ type Getter interface {
 //         B int
 //     }
 //     var T t
-//     goyaml.Unmarshal([]byte("a: 1\nb: 2"), &t)
+//     yaml.Unmarshal([]byte("a: 1\nb: 2"), &t)
 //
 // See the documentation of Marshal for the format of tags and a list of
 // supported tag options.
@@ -94,14 +98,16 @@ func Unmarshal(in []byte, out interface{}) (err error) {

 // Marshal serializes the value provided into a YAML document. The structure
 // of the generated document will reflect the structure of the value itself.
-// Maps, pointers to structs and ints, etc, may all be used as the in value.
+// Maps and pointers (to struct, string, int, etc) are accepted as the in value.
 //
-// In the case of struct values, only exported fields will be serialized.
-// The lowercased field name is used as the key for each exported field,
-// but this behavior may be changed using the respective field tag.
-// The tag may also contain flags to tweak the marshalling behavior for
-// the field. Conflicting names result in a runtime error. The tag format
-// accepted is:
+// Struct fields are only unmarshalled if they are exported (have an upper case
+// first letter), and are unmarshalled using the field name lowercased as the
+// default key. Custom keys may be defined via the "yaml" name in the field
+// tag: the content preceding the first comma is used as the key, and the
+// following comma-separated options are used to tweak the marshalling process.
+// Conflicting names result in a runtime error.
+//
+// The field tag format accepted is:
 //
 //     `(...) yaml:"[<key>][,<flag1>[,<flag2>]]" (...)`
 //
@@ -126,8 +132,8 @@ func Unmarshal(in []byte, out interface{}) (err error) {
 //         F int "a,omitempty"
 //         B int
 //     }
-//     goyaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
-//     goyaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n"
+//     yaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
+//     yaml.Marshal(&T{F: 1}} // Returns "a: 1\nb: 0\n"
 //
 func Marshal(in interface{}) (out []byte, err error) {
 	defer handleErr(&err)
@@ -142,7 +148,7 @@ func Marshal(in interface{}) (out []byte, err error) {
 // --------------------------------------------------------------------------
 // Maintain a mapping of keys to structure field indexes

-// The code in this section was copied from gobson.
+// The code in this section was copied from mgo/bson.

 // structInfo holds details for the serialization of fields of
 // a given struct.
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 import (
 	"io"
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go
+++ b/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go
@@ -1,4 +1,4 @@
-package goyaml
+package yaml

 const (
 	// The size of the input raw buffer.
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
+Alex Crawford <alex.crawford@coreos.com> (@crawford)
+Jonathan Boulle <jonathan.boulle@coreos.com> (@jonboulle)
+Brian Waldon <brian.waldon@coreos.com> (@bcwaldon)
--- a/config/config.go
+++ b/config/config.go
@@ -0,0 +1,186 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/gopkg.in/yaml.v1"
+)
+
+// CloudConfig encapsulates the entire cloud-config configuration file and maps
+// directly to YAML. Fields that cannot be set in the cloud-config (fields
+// used for internal use) have the YAML tag '-' so that they aren't marshalled.
+type CloudConfig struct {
+	SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"`
+	Coreos            struct {
+		Etcd    Etcd    `yaml:"etcd"`
+		Flannel Flannel `yaml:"flannel"`
+		Fleet   Fleet   `yaml:"fleet"`
+		OEM     OEM     `yaml:"oem"`
+		Update  Update  `yaml:"update"`
+		Units   []Unit  `yaml:"units"`
+	} `yaml:"coreos"`
+	WriteFiles        []File   `yaml:"write_files"`
+	Hostname          string   `yaml:"hostname"`
+	Users             []User   `yaml:"users"`
+	ManageEtcHosts    EtcHosts `yaml:"manage_etc_hosts"`
+	NetworkConfigPath string   `yaml:"-"`
+	NetworkConfig     string   `yaml:"-"`
+}
+
+func IsCloudConfig(userdata string) bool {
+	header := strings.SplitN(userdata, "\n", 2)[0]
+
+	// Explicitly trim the header so we can handle user-data from
+	// non-unix operating systems. The rest of the file is parsed
+	// by yaml, which correctly handles CRLF.
+	header = strings.TrimSuffix(header, "\r")
+
+	return (header == "#cloud-config")
+}
+
+// NewCloudConfig instantiates a new CloudConfig from the given contents (a
+// string of YAML), returning any error encountered. It will ignore unknown
+// fields but log encountering them.
+func NewCloudConfig(contents string) (*CloudConfig, error) {
+	var cfg CloudConfig
+	ncontents, err := normalizeConfig(contents)
+	if err != nil {
+		return &cfg, err
+	}
+	if err = yaml.Unmarshal(ncontents, &cfg); err != nil {
+		return &cfg, err
+	}
+	return &cfg, nil
+}
+
+func (cc CloudConfig) String() string {
+	bytes, err := yaml.Marshal(cc)
+	if err != nil {
+		return ""
+	}
+
+	stringified := string(bytes)
+	stringified = fmt.Sprintf("#cloud-config\n%s", stringified)
+
+	return stringified
+}
+
+// IsZero returns whether or not the parameter is the zero value for its type.
+// If the parameter is a struct, only the exported fields are considered.
+func IsZero(c interface{}) bool {
+	return isZero(reflect.ValueOf(c))
+}
+
+type ErrorValid struct {
+	Value string
+	Valid []string
+	Field string
+}
+
+func (e ErrorValid) Error() string {
+	return fmt.Sprintf("invalid value %q for option %q (valid options: %q)", e.Value, e.Field, e.Valid)
+}
+
+// AssertStructValid checks the fields in the structure and makes sure that
+// they contain valid values as specified by the 'valid' flag. Empty fields are
+// implicitly valid.
+func AssertStructValid(c interface{}) error {
+	ct := reflect.TypeOf(c)
+	cv := reflect.ValueOf(c)
+	for i := 0; i < ct.NumField(); i++ {
+		ft := ct.Field(i)
+		if !isFieldExported(ft) {
+			continue
+		}
+
+		if err := AssertValid(cv.Field(i), ft.Tag.Get("valid")); err != nil {
+			err.Field = ft.Name
+			return err
+		}
+	}
+	return nil
+}
+
+// AssertValid checks to make sure that the given value is in the list of
+// valid values. Zero values are implicitly valid.
+func AssertValid(value reflect.Value, valid string) *ErrorValid {
+	if valid == "" || isZero(value) {
+		return nil
+	}
+	vs := fmt.Sprintf("%v", value.Interface())
+	valids := strings.Split(valid, ",")
+	for _, valid := range valids {
+		if vs == valid {
+			return nil
+		}
+	}
+	return &ErrorValid{
+		Value: vs,
+		Valid: valids,
+	}
+}
+
+func isZero(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.Struct:
+		vt := v.Type()
+		for i := 0; i < v.NumField(); i++ {
+			if isFieldExported(vt.Field(i)) && !isZero(v.Field(i)) {
+				return false
+			}
+		}
+		return true
+	default:
+		return v.Interface() == reflect.Zero(v.Type()).Interface()
+	}
+}
+
+func isFieldExported(f reflect.StructField) bool {
+	return f.PkgPath == ""
+}
+
+func normalizeConfig(config string) ([]byte, error) {
+	var cfg map[interface{}]interface{}
+	if err := yaml.Unmarshal([]byte(config), &cfg); err != nil {
+		return nil, err
+	}
+	return yaml.Marshal(normalizeKeys(cfg))
+}
+
+func normalizeKeys(m map[interface{}]interface{}) map[interface{}]interface{} {
+	for k, v := range m {
+		if m, ok := m[k].(map[interface{}]interface{}); ok {
+			normalizeKeys(m)
+		}
+
+		if s, ok := m[k].([]interface{}); ok {
+			for _, e := range s {
+				if m, ok := e.(map[interface{}]interface{}); ok {
+					normalizeKeys(m)
+				}
+			}
+		}
+
+		delete(m, k)
+		m[strings.Replace(fmt.Sprint(k), "-", "_", -1)] = v
+	}
+	return m
+}
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -0,0 +1,526 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+)
+
+func TestIsZero(t *testing.T) {
+	for _, tt := range []struct {
+		c     interface{}
+		empty bool
+	}{
+		{struct{}{}, true},
+		{struct{ a, b string }{}, true},
+		{struct{ A, b string }{}, true},
+		{struct{ A, B string }{}, true},
+		{struct{ A string }{A: "hello"}, false},
+		{struct{ A int }{}, true},
+		{struct{ A int }{A: 1}, false},
+	} {
+		if empty := IsZero(tt.c); tt.empty != empty {
+			t.Errorf("bad result (%q): want %t, got %t", tt.c, tt.empty, empty)
+		}
+	}
+}
+
+func TestAssertStructValid(t *testing.T) {
+	for _, tt := range []struct {
+		c   interface{}
+		err error
+	}{
+		{struct{}{}, nil},
+		{struct {
+			A, b string `valid:"1,2"`
+		}{}, nil},
+		{struct {
+			A, b string `valid:"1,2"`
+		}{A: "1", b: "2"}, nil},
+		{struct {
+			A, b string `valid:"1,2"`
+		}{A: "1", b: "hello"}, nil},
+		{struct {
+			A, b string `valid:"1,2"`
+		}{A: "hello", b: "2"}, &ErrorValid{Value: "hello", Field: "A", Valid: []string{"1", "2"}}},
+		{struct {
+			A, b int `valid:"1,2"`
+		}{}, nil},
+		{struct {
+			A, b int `valid:"1,2"`
+		}{A: 1, b: 2}, nil},
+		{struct {
+			A, b int `valid:"1,2"`
+		}{A: 1, b: 9}, nil},
+		{struct {
+			A, b int `valid:"1,2"`
+		}{A: 9, b: 2}, &ErrorValid{Value: "9", Field: "A", Valid: []string{"1", "2"}}},
+	} {
+		if err := AssertStructValid(tt.c); !reflect.DeepEqual(tt.err, err) {
+			t.Errorf("bad result (%q): want %q, got %q", tt.c, tt.err, err)
+		}
+	}
+}
+
+func TestCloudConfigInvalidKeys(t *testing.T) {
+	defer func() {
+		if r := recover(); r != nil {
+			t.Fatalf("panic while instantiating CloudConfig with nil keys: %v", r)
+		}
+	}()
+
+	for _, tt := range []struct {
+		contents string
+	}{
+		{"coreos:"},
+		{"ssh_authorized_keys:"},
+		{"ssh_authorized_keys:\n  -"},
+		{"ssh_authorized_keys:\n  - 0:"},
+		{"write_files:"},
+		{"write_files:\n  -"},
+		{"write_files:\n  - 0:"},
+		{"users:"},
+		{"users:\n  -"},
+		{"users:\n  - 0:"},
+	} {
+		_, err := NewCloudConfig(tt.contents)
+		if err != nil {
+			t.Fatalf("error instantiating CloudConfig with invalid keys: %v", err)
+		}
+	}
+}
+
+func TestCloudConfigUnknownKeys(t *testing.T) {
+	contents := `
+coreos: 
+  etcd:
+    discovery: "https://discovery.etcd.io/827c73219eeb2fa5530027c37bf18877"
+  coreos_unknown:
+    foo: "bar"
+section_unknown:
+  dunno:
+    something
+bare_unknown:
+  bar
+write_files:
+  - content: fun
+    path: /var/party
+    file_unknown: nofun
+users:
+  - name: fry
+    passwd: somehash
+    user_unknown: philip
+hostname:
+  foo
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("error instantiating CloudConfig with unknown keys: %v", err)
+	}
+	if cfg.Hostname != "foo" {
+		t.Fatalf("hostname not correctly set when invalid keys are present")
+	}
+	if cfg.Coreos.Etcd.Discovery != "https://discovery.etcd.io/827c73219eeb2fa5530027c37bf18877" {
+		t.Fatalf("etcd section not correctly set when invalid keys are present")
+	}
+	if len(cfg.WriteFiles) < 1 || cfg.WriteFiles[0].Content != "fun" || cfg.WriteFiles[0].Path != "/var/party" {
+		t.Fatalf("write_files section not correctly set when invalid keys are present")
+	}
+	if len(cfg.Users) < 1 || cfg.Users[0].Name != "fry" || cfg.Users[0].PasswordHash != "somehash" {
+		t.Fatalf("users section not correctly set when invalid keys are present")
+	}
+}
+
+// Assert that the parsing of a cloud config file "generally works"
+func TestCloudConfigEmpty(t *testing.T) {
+	cfg, err := NewCloudConfig("")
+	if err != nil {
+		t.Fatalf("Encountered unexpected error :%v", err)
+	}
+
+	keys := cfg.SSHAuthorizedKeys
+	if len(keys) != 0 {
+		t.Error("Parsed incorrect number of SSH keys")
+	}
+
+	if len(cfg.WriteFiles) != 0 {
+		t.Error("Expected zero WriteFiles")
+	}
+
+	if cfg.Hostname != "" {
+		t.Errorf("Expected hostname to be empty, got '%s'", cfg.Hostname)
+	}
+}
+
+// Assert that the parsing of a cloud config file "generally works"
+func TestCloudConfig(t *testing.T) {
+	contents := `
+coreos: 
+  etcd:
+    discovery: "https://discovery.etcd.io/827c73219eeb2fa5530027c37bf18877"
+  update:
+    reboot_strategy: reboot
+  units:
+    - name: 50-eth0.network
+      runtime: yes
+      content: '[Match]
+ 
+    Name=eth47
+ 
+ 
+    [Network]
+ 
+    Address=10.209.171.177/19
+ 
+'
+  oem:
+    id: rackspace
+    name: Rackspace Cloud Servers
+    version_id: 168.0.0
+    home_url: https://www.rackspace.com/cloud/servers/
+    bug_report_url: https://github.com/coreos/coreos-overlay
+ssh_authorized_keys:
+  - foobar
+  - foobaz
+write_files:
+  - content: |
+      penny
+      elroy
+    path: /etc/dogepack.conf
+    permissions: '0644'
+    owner: root:dogepack
+hostname: trontastic
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("Encountered unexpected error :%v", err)
+	}
+
+	keys := cfg.SSHAuthorizedKeys
+	if len(keys) != 2 {
+		t.Error("Parsed incorrect number of SSH keys")
+	} else if keys[0] != "foobar" {
+		t.Error("Expected first SSH key to be 'foobar'")
+	} else if keys[1] != "foobaz" {
+		t.Error("Expected first SSH key to be 'foobaz'")
+	}
+
+	if len(cfg.WriteFiles) != 1 {
+		t.Error("Failed to parse correct number of write_files")
+	} else {
+		wf := cfg.WriteFiles[0]
+		if wf.Content != "penny\nelroy\n" {
+			t.Errorf("WriteFile has incorrect contents '%s'", wf.Content)
+		}
+		if wf.Encoding != "" {
+			t.Errorf("WriteFile has incorrect encoding %s", wf.Encoding)
+		}
+		if wf.RawFilePermissions != "0644" {
+			t.Errorf("WriteFile has incorrect permissions %s", wf.RawFilePermissions)
+		}
+		if wf.Path != "/etc/dogepack.conf" {
+			t.Errorf("WriteFile has incorrect path %s", wf.Path)
+		}
+		if wf.Owner != "root:dogepack" {
+			t.Errorf("WriteFile has incorrect owner %s", wf.Owner)
+		}
+	}
+
+	if len(cfg.Coreos.Units) != 1 {
+		t.Error("Failed to parse correct number of units")
+	} else {
+		u := cfg.Coreos.Units[0]
+		expect := `[Match]
+Name=eth47
+
+[Network]
+Address=10.209.171.177/19
+`
+		if u.Content != expect {
+			t.Errorf("Unit has incorrect contents '%s'.\nExpected '%s'.", u.Content, expect)
+		}
+		if u.Runtime != true {
+			t.Errorf("Unit has incorrect runtime value")
+		}
+		if u.Name != "50-eth0.network" {
+			t.Errorf("Unit has incorrect name %s", u.Name)
+		}
+		if u.Type() != "network" {
+			t.Errorf("Unit has incorrect type '%s'", u.Type())
+		}
+	}
+
+	if cfg.Coreos.OEM.ID != "rackspace" {
+		t.Errorf("Failed parsing coreos.oem. Expected ID 'rackspace', got %q.", cfg.Coreos.OEM.ID)
+	}
+
+	if cfg.Hostname != "trontastic" {
+		t.Errorf("Failed to parse hostname")
+	}
+	if cfg.Coreos.Update.RebootStrategy != "reboot" {
+		t.Errorf("Failed to parse locksmith strategy")
+	}
+
+	contents = `
+coreos:
+write_files:
+  - path: /home/me/notes
+    permissions: 0744
+`
+	cfg, err = NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("Encountered unexpected error :%v", err)
+	}
+
+	if len(cfg.WriteFiles) != 1 {
+		t.Error("Failed to parse correct number of write_files")
+	} else {
+		wf := cfg.WriteFiles[0]
+		if wf.Content != "" {
+			t.Errorf("WriteFile has incorrect contents '%s'", wf.Content)
+		}
+		if wf.Encoding != "" {
+			t.Errorf("WriteFile has incorrect encoding %s", wf.Encoding)
+		}
+		// Verify that the normalization of the config converted 0744 to its decimal
+		// representation, 484.
+		if wf.RawFilePermissions != "484" {
+			t.Errorf("WriteFile has incorrect permissions %s", wf.RawFilePermissions)
+		}
+		if wf.Path != "/home/me/notes" {
+			t.Errorf("WriteFile has incorrect path %s", wf.Path)
+		}
+		if wf.Owner != "" {
+			t.Errorf("WriteFile has incorrect owner %s", wf.Owner)
+		}
+	}
+}
+
+// Assert that our interface conversion doesn't panic
+func TestCloudConfigKeysNotList(t *testing.T) {
+	contents := `
+ssh_authorized_keys:
+  - foo: bar
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("Encountered unexpected error: %v", err)
+	}
+
+	keys := cfg.SSHAuthorizedKeys
+	if len(keys) != 0 {
+		t.Error("Parsed incorrect number of SSH keys")
+	}
+}
+
+func TestCloudConfigSerializationHeader(t *testing.T) {
+	cfg, _ := NewCloudConfig("")
+	contents := cfg.String()
+	header := strings.SplitN(contents, "\n", 2)[0]
+	if header != "#cloud-config" {
+		t.Fatalf("Serialized config did not have expected header")
+	}
+}
+
+// TestDropInIgnored asserts that users are unable to set DropIn=True on units
+func TestDropInIgnored(t *testing.T) {
+	contents := `
+coreos:
+  units:
+    - name: test
+      dropin: true
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil || len(cfg.Coreos.Units) != 1 {
+		t.Fatalf("Encountered unexpected error: %v", err)
+	}
+	if len(cfg.Coreos.Units) != 1 || cfg.Coreos.Units[0].Name != "test" {
+		t.Fatalf("Expected 1 unit, but got %d: %v", len(cfg.Coreos.Units), cfg.Coreos.Units)
+	}
+	if cfg.Coreos.Units[0].DropIn {
+		t.Errorf("dropin option on unit in cloud-config was not ignored!")
+	}
+}
+
+func TestCloudConfigUsers(t *testing.T) {
+	contents := `
+users:
+  - name: elroy
+    passwd: somehash
+    ssh_authorized_keys:
+      - somekey
+    gecos: arbitrary comment
+    homedir: /home/place
+    no_create_home: yes
+    primary_group: things
+    groups:
+      - ping
+      - pong
+    no_user_group: true
+    system: y
+    no_log_init: True
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("Encountered unexpected error: %v", err)
+	}
+
+	if len(cfg.Users) != 1 {
+		t.Fatalf("Parsed %d users, expected 1", len(cfg.Users))
+	}
+
+	user := cfg.Users[0]
+
+	if user.Name != "elroy" {
+		t.Errorf("User name is %q, expected 'elroy'", user.Name)
+	}
+
+	if user.PasswordHash != "somehash" {
+		t.Errorf("User passwd is %q, expected 'somehash'", user.PasswordHash)
+	}
+
+	if keys := user.SSHAuthorizedKeys; len(keys) != 1 {
+		t.Errorf("Parsed %d ssh keys, expected 1", len(keys))
+	} else {
+		key := user.SSHAuthorizedKeys[0]
+		if key != "somekey" {
+			t.Errorf("User SSH key is %q, expected 'somekey'", key)
+		}
+	}
+
+	if user.GECOS != "arbitrary comment" {
+		t.Errorf("Failed to parse gecos field, got %q", user.GECOS)
+	}
+
+	if user.Homedir != "/home/place" {
+		t.Errorf("Failed to parse homedir field, got %q", user.Homedir)
+	}
+
+	if !user.NoCreateHome {
+		t.Errorf("Failed to parse no_create_home field")
+	}
+
+	if user.PrimaryGroup != "things" {
+		t.Errorf("Failed to parse primary_group field, got %q", user.PrimaryGroup)
+	}
+
+	if len(user.Groups) != 2 {
+		t.Errorf("Failed to parse 2 goups, got %d", len(user.Groups))
+	} else {
+		if user.Groups[0] != "ping" {
+			t.Errorf("First group was %q, not expected value 'ping'", user.Groups[0])
+		}
+		if user.Groups[1] != "pong" {
+			t.Errorf("First group was %q, not expected value 'pong'", user.Groups[1])
+		}
+	}
+
+	if !user.NoUserGroup {
+		t.Errorf("Failed to parse no_user_group field")
+	}
+
+	if !user.System {
+		t.Errorf("Failed to parse system field")
+	}
+
+	if !user.NoLogInit {
+		t.Errorf("Failed to parse no_log_init field")
+	}
+}
+
+func TestCloudConfigUsersGithubUser(t *testing.T) {
+
+	contents := `
+users:
+  - name: elroy
+    coreos_ssh_import_github: bcwaldon
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("Encountered unexpected error: %v", err)
+	}
+
+	if len(cfg.Users) != 1 {
+		t.Fatalf("Parsed %d users, expected 1", len(cfg.Users))
+	}
+
+	user := cfg.Users[0]
+
+	if user.Name != "elroy" {
+		t.Errorf("User name is %q, expected 'elroy'", user.Name)
+	}
+
+	if user.SSHImportGithubUser != "bcwaldon" {
+		t.Errorf("github user is %q, expected 'bcwaldon'", user.SSHImportGithubUser)
+	}
+}
+
+func TestCloudConfigUsersSSHImportURL(t *testing.T) {
+	contents := `
+users:
+  - name: elroy
+    coreos_ssh_import_url: https://token:x-auth-token@github.enterprise.com/api/v3/polvi/keys
+`
+	cfg, err := NewCloudConfig(contents)
+	if err != nil {
+		t.Fatalf("Encountered unexpected error: %v", err)
+	}
+
+	if len(cfg.Users) != 1 {
+		t.Fatalf("Parsed %d users, expected 1", len(cfg.Users))
+	}
+
+	user := cfg.Users[0]
+
+	if user.Name != "elroy" {
+		t.Errorf("User name is %q, expected 'elroy'", user.Name)
+	}
+
+	if user.SSHImportURL != "https://token:x-auth-token@github.enterprise.com/api/v3/polvi/keys" {
+		t.Errorf("ssh import url is %q, expected 'https://token:x-auth-token@github.enterprise.com/api/v3/polvi/keys'", user.SSHImportURL)
+	}
+}
+
+func TestNormalizeKeys(t *testing.T) {
+	for _, tt := range []struct {
+		in  string
+		out string
+	}{
+		{"my_key_name: the-value\n", "my_key_name: the-value\n"},
+		{"my-key_name: the-value\n", "my_key_name: the-value\n"},
+		{"my-key-name: the-value\n", "my_key_name: the-value\n"},
+
+		{"a:\n- key_name: the-value\n", "a:\n- key_name: the-value\n"},
+		{"a:\n- key-name: the-value\n", "a:\n- key_name: the-value\n"},
+
+		{"a:\n  b:\n  - key_name: the-value\n", "a:\n  b:\n  - key_name: the-value\n"},
+		{"a:\n  b:\n  - key-name: the-value\n", "a:\n  b:\n  - key_name: the-value\n"},
+
+		{"coreos:\n  update:\n    reboot-strategy: off\n", "coreos:\n  update:\n    reboot_strategy: false\n"},
+		{"coreos:\n  update:\n    reboot-strategy: 'off'\n", "coreos:\n  update:\n    reboot_strategy: \"off\"\n"},
+	} {
+		out, err := normalizeConfig(tt.in)
+		if err != nil {
+			t.Fatalf("bad error (%q): want nil, got %s", tt.in, err)
+		}
+		if string(out) != tt.out {
+			t.Fatalf("bad normalization (%q): want %q, got %q", tt.in, tt.out, out)
+		}
+	}
+}
--- a/config/etc_hosts.go
+++ b/config/etc_hosts.go
@@ -0,0 +1,19 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type EtcHosts string
--- a/config/etcd.go
+++ b/config/etcd.go
@@ -0,0 +1,53 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type Etcd struct {
+	Addr                  string  `yaml:"addr"                    env:"ETCD_ADDR"`
+	BindAddr              string  `yaml:"bind_addr"               env:"ETCD_BIND_ADDR"`
+	CAFile                string  `yaml:"ca_file"                 env:"ETCD_CA_FILE"`
+	CertFile              string  `yaml:"cert_file"               env:"ETCD_CERT_FILE"`
+	ClusterActiveSize     int     `yaml:"cluster_active_size"     env:"ETCD_CLUSTER_ACTIVE_SIZE"`
+	ClusterRemoveDelay    float64 `yaml:"cluster_remove_delay"    env:"ETCD_CLUSTER_REMOVE_DELAY"`
+	ClusterSyncInterval   float64 `yaml:"cluster_sync_interval"   env:"ETCD_CLUSTER_SYNC_INTERVAL"`
+	CorsOrigins           string  `yaml:"cors"                    env:"ETCD_CORS"`
+	DataDir               string  `yaml:"data_dir"                env:"ETCD_DATA_DIR"`
+	Discovery             string  `yaml:"discovery"               env:"ETCD_DISCOVERY"`
+	GraphiteHost          string  `yaml:"graphite_host"           env:"ETCD_GRAPHITE_HOST"`
+	HTTPReadTimeout       float64 `yaml:"http_read_timeout"       env:"ETCD_HTTP_READ_TIMEOUT"`
+	HTTPWriteTimeout      float64 `yaml:"http_write_timeout"      env:"ETCD_HTTP_WRITE_TIMEOUT"`
+	KeyFile               string  `yaml:"key_file"                env:"ETCD_KEY_FILE"`
+	MaxResultBuffer       int     `yaml:"max_result_buffer"       env:"ETCD_MAX_RESULT_BUFFER"`
+	MaxRetryAttempts      int     `yaml:"max_retry_attempts"      env:"ETCD_MAX_RETRY_ATTEMPTS"`
+	Name                  string  `yaml:"name"                    env:"ETCD_NAME"`
+	PeerAddr              string  `yaml:"peer_addr"               env:"ETCD_PEER_ADDR"`
+	PeerBindAddr          string  `yaml:"peer_bind_addr"          env:"ETCD_PEER_BIND_ADDR"`
+	PeerCAFile            string  `yaml:"peer_ca_file"            env:"ETCD_PEER_CA_FILE"`
+	PeerCertFile          string  `yaml:"peer_cert_file"          env:"ETCD_PEER_CERT_FILE"`
+	PeerElectionTimeout   int     `yaml:"peer_election_timeout"   env:"ETCD_PEER_ELECTION_TIMEOUT"`
+	PeerHeartbeatInterval int     `yaml:"peer_heartbeat_interval" env:"ETCD_PEER_HEARTBEAT_INTERVAL"`
+	PeerKeyFile           string  `yaml:"peer_key_file"           env:"ETCD_PEER_KEY_FILE"`
+	Peers                 string  `yaml:"peers"                   env:"ETCD_PEERS"`
+	PeersFile             string  `yaml:"peers_file"              env:"ETCD_PEERS_FILE"`
+	RetryInterval         float64 `yaml:"retry_interval"          env:"ETCD_RETRY_INTERVAL"`
+	Snapshot              bool    `yaml:"snapshot"                env:"ETCD_SNAPSHOT"`
+	SnapshotCount         int     `yaml:"snapshot_count"          env:"ETCD_SNAPSHOTCOUNT"`
+	StrTrace              string  `yaml:"trace"                   env:"ETCD_TRACE"`
+	Verbose               bool    `yaml:"verbose"                 env:"ETCD_VERBOSE"`
+	VeryVerbose           bool    `yaml:"very_verbose"            env:"ETCD_VERY_VERBOSE"`
+	VeryVeryVerbose       bool    `yaml:"very_very_verbose"       env:"ETCD_VERY_VERY_VERBOSE"`
+}
--- a/config/file.go
+++ b/config/file.go
@@ -0,0 +1,25 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type File struct {
+	Encoding           string `yaml:"-"`
+	Content            string `yaml:"content"`
+	Owner              string `yaml:"owner"`
+	Path               string `yaml:"path"`
+	RawFilePermissions string `yaml:"permissions"`
+}
--- a/config/flannel.go
+++ b/config/flannel.go
@@ -0,0 +1,9 @@
+package config
+
+type Flannel struct {
+	EtcdEndpoint string `yaml:"etcd_endpoint" env:"FLANNELD_ETCD_ENDPOINT"`
+	EtcdPrefix   string `yaml:"etcd_prefix"   env:"FLANNELD_ETCD_PREFIX"`
+	IPMasq       string `yaml:"ip_masq"       env:"FLANNELD_IP_MASQ"`
+	SubnetFile   string `yaml:"subnet_file"   env:"FLANNELD_SUBNET_FILE"`
+	Iface        string `yaml:"interface"     env:"FLANNELD_IFACE"`
+}
--- a/config/fleet.go
+++ b/config/fleet.go
@@ -0,0 +1,31 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type Fleet struct {
+	AgentTTL                string  `yaml:"agent_ttl"                 env:"FLEET_AGENT_TTL"`
+	EngineReconcileInterval float64 `yaml:"engine_reconcile_interval" env:"FLEET_ENGINE_RECONCILE_INTERVAL"`
+	EtcdCAFile              string  `yaml:"etcd_cafile"               env:"FLEET_ETCD_CAFILE"`
+	EtcdCertFile            string  `yaml:"etcd_certfile"             env:"FLEET_ETCD_CERTFILE"`
+	EtcdKeyFile             string  `yaml:"etcd_keyfile"              env:"FLEET_ETCD_KEYFILE"`
+	EtcdKeyPrefix           string  `yaml:"etcd_key_prefix"           env:"FLEET_ETCD_KEY_PREFIX"`
+	EtcdRequestTimeout      float64 `yaml:"etcd_request_timeout"      env:"FLEET_ETCD_REQUEST_TIMEOUT"`
+	EtcdServers             string  `yaml:"etcd_servers"              env:"FLEET_ETCD_SERVERS"`
+	Metadata                string  `yaml:"metadata"                  env:"FLEET_METADATA"`
+	PublicIP                string  `yaml:"public_ip"                 env:"FLEET_PUBLIC_IP"`
+	Verbosity               int     `yaml:"verbosity"                 env:"FLEET_VERBOSITY"`
+}
--- a/config/oem.go
+++ b/config/oem.go
@@ -0,0 +1,25 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type OEM struct {
+	ID           string `yaml:"id"`
+	Name         string `yaml:"name"`
+	VersionID    string `yaml:"version_id"`
+	HomeURL      string `yaml:"home_url"`
+	BugReportURL string `yaml:"bug_report_url"`
+}
--- a/config/script.go
+++ b/config/script.go
@@ -0,0 +1,32 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+import (
+	"strings"
+)
+
+type Script []byte
+
+func IsScript(userdata string) bool {
+	header := strings.SplitN(userdata, "\n", 2)[0]
+	return strings.HasPrefix(header, "#!")
+}
+
+func NewScript(userdata string) (Script, error) {
+	return Script(userdata), nil
+}
--- a/config/unit.go
+++ b/config/unit.go
@@ -0,0 +1,50 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+import (
+	"path/filepath"
+	"strings"
+)
+
+type Unit struct {
+	Name    string `yaml:"name"`
+	Mask    bool   `yaml:"mask"`
+	Enable  bool   `yaml:"enable"`
+	Runtime bool   `yaml:"runtime"`
+	Content string `yaml:"content"`
+	Command string `yaml:"command" valid:"start,stop,restart,reload,try-restart,reload-or-restart,reload-or-try-restart"`
+
+	// For drop-in units, a cloudinit.conf is generated.
+	// This is currently unbound in YAML (and hence unsettable in cloud-config files)
+	// until the correct behaviour for multiple drop-in units is determined.
+	DropIn bool `yaml:"-"`
+}
+
+func (u *Unit) Type() string {
+	ext := filepath.Ext(u.Name)
+	return strings.TrimLeft(ext, ".")
+}
+
+func (u *Unit) Group() string {
+	switch u.Type() {
+	case "network", "netdev", "link":
+		return "network"
+	default:
+		return "system"
+	}
+}
--- a/config/update.go
+++ b/config/update.go
@@ -0,0 +1,23 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type Update struct {
+	RebootStrategy string `yaml:"reboot_strategy" env:"REBOOT_STRATEGY" valid:"best-effort,etcd-lock,reboot,off,false"`
+	Group          string `yaml:"group"           env:"GROUP"`
+	Server         string `yaml:"server"          env:"SERVER"`
+}
--- a/config/user.go
+++ b/config/user.go
@@ -0,0 +1,33 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package config
+
+type User struct {
+	Name                string   `yaml:"name"`
+	PasswordHash        string   `yaml:"passwd"`
+	SSHAuthorizedKeys   []string `yaml:"ssh_authorized_keys"`
+	SSHImportGithubUser string   `yaml:"coreos_ssh_import_github"`
+	SSHImportURL        string   `yaml:"coreos_ssh_import_url"`
+	GECOS               string   `yaml:"gecos"`
+	Homedir             string   `yaml:"homedir"`
+	NoCreateHome        bool     `yaml:"no_create_home"`
+	PrimaryGroup        string   `yaml:"primary_group"`
+	Groups              []string `yaml:"groups"`
+	NoUserGroup         bool     `yaml:"no_user_group"`
+	System              bool     `yaml:"system"`
+	NoLogInit           bool     `yaml:"no_log_init"`
+}
--- a/config/validate/context.go
+++ b/config/validate/context.go
@@ -0,0 +1,54 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package validate
+
+import (
+	"strings"
+)
+
+// context represents the current position within a newline-delimited string.
+// Each line is loaded, one by one, into currentLine (newline omitted) and
+// lineNumber keeps track of its position within the original string.
+type context struct {
+	currentLine    string
+	remainingLines string
+	lineNumber     int
+}
+
+// Increment moves the context to the next line (if available).
+func (c *context) Increment() {
+	if c.currentLine == "" && c.remainingLines == "" {
+		return
+	}
+
+	lines := strings.SplitN(c.remainingLines, "\n", 2)
+	c.currentLine = lines[0]
+	if len(lines) == 2 {
+		c.remainingLines = lines[1]
+	} else {
+		c.remainingLines = ""
+	}
+	c.lineNumber++
+}
+
+// NewContext creates a context from the provided data. It strips out all
+// carriage returns and moves to the first line (if available).
+func NewContext(content []byte) context {
+	c := context{remainingLines: strings.Replace(string(content), "\r", "", -1)}
+	c.Increment()
+	return c
+}
--- a/config/validate/context_test.go
+++ b/config/validate/context_test.go
@@ -0,0 +1,133 @@
+/*
+   Copyright 2014 CoreOS, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package validate
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestNewContext(t *testing.T) {
+	tests := []struct {
+		in string
+
+		out context
+	}{
+		{
+			out: context{
+				currentLine:    "",
+				remainingLines: "",
+				lineNumber:     0,
+			},
+		},
+		{
+			in: "this\r\nis\r\na\r\ntest",
+			out: context{
+				currentLine:    "this",
+				remainingLines: "is\na\ntest",
+				lineNumber:     1,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		if out := NewContext([]byte(tt.in)); !reflect.DeepEqual(tt.out, out) {
+			t.Errorf("bad context (%q): want %#v, got %#v", tt.in, tt.out, out)
+		}
+	}
+}
+
+func TestIncrement(t *testing.T) {
+	tests := []struct {
+		init context
+		op   func(c *context)
+
+		res context
+	}{
+		{
+			init: context{
+				currentLine:    "",
+				remainingLines: "",
+				lineNumber:     0,
+			},
+			res: context{
+				currentLine:    "",
+				remainingLines: "",
+				lineNumber:     0,
+			},
+			op: func(c *context) {
+				c.Increment()
+			},
+		},
+		{
+			init: context{
+				currentLine:    "test",
+				remainingLines: "",
+				lineNumber:     1,
+			},
+			res: context{
+				currentLine:    "",
+				remainingLines: "",
+				lineNumber:     2,
+			},
+			op: func(c *context) {
+				c.Increment()
+				c.Increment()
+				c.Increment()
+			},
+		},
+		{
+			init: context{
+				currentLine:    "this",
+				remainingLines: "is\na\ntest",
+				lineNumber:     1,
+			},
+			res: context{
+				currentLine:    "is",
+				remainingLines: "a\ntest",
+				lineNumber:     2,
+			},
+			op: func(c *context) {
+				c.Increment()
+			},
+		},
+		{
+			init: context{
+				currentLine:    "this",
+				remainingLines: "is\na\ntest",
+				lineNumber:     1,
+			},
+			res: context{
+				currentLine:    "test",
+				remainingLines: "",
+				lineNumber:     4,
+			},
+			op: func(c *context) {
+				c.Increment()
+				c.Increment()
+				c.Increment()
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		res := tt.init
+		if tt.op(&res); !reflect.DeepEqual(tt.res, res) {
+			t.Errorf("bad context (%d, %#v): want %#v, got %#v", i, tt.init, tt.res, res)
+		}
+	}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Crawford	eca51031c8	coreos-cloudinit: bump to 0.11.4	2014-11-21 20:11:37 -08:00
Alex Crawford	19522bcb82	Merge pull request #266 from crawford/config config: update configs to match etcd, fleet, and flannel	2014-11-21 20:10:34 -08:00
Alex Crawford	62248ea33d	config/fleet: fix configs Added EtcdKeyPrefix and fixed the types of EngineReconcileInterval and EtcdRequestTimeout.	2014-11-21 16:57:00 -08:00
Alex Crawford	d2a19cc86d	config/flannel: correct - vs _	2014-11-21 16:57:00 -08:00
Alex Crawford	08131ffab1	config/etcd: fix configs This new table is pulled from the etcd codebase rather than the docs... Added: GraphiteHost PeerElectionTimeout PeerHeartbeatInterval PeerKeyFile RetryInterval SnapshotCount StrTrace VeryVeryVerbose Fixed types: ClusterActiveSize ClusterRemoveDelay ClusterSyncInterval HTTPReadTimeout HTTPWriteTimeout MaxResultBuffer MaxRetryAttempts Snapshot Verbose VeryVerbose Renamed: Cors Removed: MaxClusterSize CPUProfileFile	2014-11-21 16:57:00 -08:00
Alex Crawford	4a0019c669	config: add support for float64	2014-11-21 16:13:49 -08:00
Alex Crawford	3275ead1ec	coreos-cloudinit: bump to 0.11.3+git	2014-11-21 12:25:26 -08:00
Alex Crawford	32b6a55724	coreos-cloudinit: bump to 0.11.3	2014-11-21 12:25:04 -08:00
Alex Crawford	6c43644369	Merge pull request #265 from crawford/update config/update: add "off" as a valid strategy	2014-11-21 12:22:45 -08:00
Alex Crawford	e6593d49e6	config/update: add "off" as a valid strategy It was assumed that the user would specify the reboot strategy as an unquoted value. In the case that they turn off updates, `off` is interpreted as a boolean and the normalization pass converts that to `false`. In the event that the user uses `"off"`, it's interpreted as a string and not modified.	2014-11-21 10:41:03 -08:00
Alex Crawford	ab752b239f	coreos-cloudinit: bump to 0.11.2+git	2014-11-20 11:29:25 -08:00
Alex Crawford	0742e4d357	coreos-cloudinit: bump to 0.11.2	2014-11-20 11:29:12 -08:00
Alex Crawford	78f586ec9e	Merge pull request #262 from crawford/permissions config: fix parsing of file permissions	2014-11-20 11:28:11 -08:00
Alex Crawford	6f91b76d79	docs: correct type of permissions	2014-11-20 11:14:44 -08:00
Alex Crawford	5c80ccacc4	config: fix parsing of file permissions The file permissions can be specified (unfortunately) as a string or an octal integer. During the normalization step, every field is unmarshalled into an interface{}. String types are kept in tact but integers are converted to decimal integers. If the raw config represented the permissions as an octal, it would be converted to decimal _before_ it was saved to RawFilePermissions. Permissions() would then try to convert it again, assuming it was an octal. The new behavior doesn't assume the radix of the number, allowing decimal and octal input.	2014-11-20 11:14:44 -08:00
Alex Crawford	97758b343b	coreos-cloudinit: bump to 0.11.1+git	2014-11-18 12:14:34 -08:00
Alex Crawford	fb6f52b360	coreos-cloudinit: bump to 0.11.1	2014-11-18 12:14:29 -08:00
Alex Crawford	786cd2a539	Merge pull request #259 from crawford/hyphen config/validate: disable - vs _ message for now	2014-11-18 12:12:26 -08:00
Alex Crawford	45793f1254	config/validate: disable - vs _ message for now	2014-11-18 12:11:50 -08:00
Alex Crawford	b621756d92	Merge pull request #258 from crawford/header config/validate: fix line number for header check	2014-11-18 12:11:35 -08:00
Alex Crawford	a5b5c700a6	config/validate: fix line number for header check	2014-11-18 12:02:23 -08:00
Alex Crawford	d7602f3c08	Merge pull request #244 from eyakubovich/master flannel: added flannel support and helper to make dropins	2014-11-14 10:46:19 -08:00
Eugene Yakubovich	a20addd05e	flannel: added flannel support and helper to make dropins fleet, flannel, and etcd all generate dropins from config. To reduce code duplication, factor out a helper to do that.	2014-11-14 10:45:23 -08:00
Alex Crawford	d9d89a6fa0	coreos-cloudinit: bump to 0.11.0+git	2014-11-14 10:42:00 -08:00
Alex Crawford	3c26376326	coreos-cloudinit: bump to 0.11.0	2014-11-14 10:41:47 -08:00
Alex Crawford	d3294bcb86	Merge pull request #254 from crawford/validator config: add new validator	2014-11-12 17:40:16 -08:00
Alex Crawford	dda314b518	flags: add validate flag This will allow the user to run a standalone validation.	2014-11-12 16:48:57 -08:00
Alex Crawford	055a3c339a	config/validate: add new config validator This validator is still experimental and is going to need new rules in the future. This lays out the general framework.	2014-11-12 16:48:57 -08:00
Alex Crawford	51f37100a1	config: remove config validator	2014-11-07 10:18:08 -08:00
Alex Crawford	88e8265cd6	config: seperate AssertValid and AssertStructValid Added an error structure to make it possible to get the specifics of the failure.	2014-11-07 10:14:34 -08:00
Alex Crawford	6e2db882e6	script: move Script into config package	2014-11-07 10:13:52 -08:00
Alex Crawford	3e2823df1b	Merge pull request #256 from crawford/hyphen config: deprecate - in favor of _ for key names	2014-11-03 14:54:23 -08:00
Alex Crawford	46cb51cf91	Merge pull request #257 from crawford/networkd networkd: remove double-restart workaround	2014-11-03 14:25:38 -08:00
Alex Crawford	1a6cee5305	networkd: remove double-restart workaround The kernel fixed the underlying issue in 763e0ec and e721f87.	2014-11-03 14:11:15 -08:00
Alex Crawford	d02aa18839	config: deprecate - in favor of _ for key names In all of the YAML tags, - has been replaced with _. normalizeConfig() and normalizeKeys() have also been added to perform the normalization of the input cloud-config. As part of the normalization process, falsey values are converted to "false". The "off" update strategy is no exception and as a result the "off" update strategy has been changed to "false".	2014-11-03 12:09:52 -08:00
Alex Crawford	e9bda98b54	Merge pull request #252 from crawford/vet go vet	2014-10-23 12:03:01 -07:00
Alex Crawford	badc874b74	travis: install go vet	2014-10-23 11:47:24 -07:00
Alex Crawford	c9e8c887b8	test: run go vet	2014-10-23 11:46:40 -07:00
Alex Crawford	8be307de49	*: fix warnings from go vet	2014-10-23 11:46:08 -07:00
Alex Crawford	562c474275	system: embed config within EtcHosts and Update	2014-10-23 11:44:15 -07:00
Jonathan Boulle	5c5834863b	Merge pull request #250 from jonboulle/master *: switch to Godeps	2014-10-20 12:09:04 -07:00
Jonathan Boulle	44f0a949c5	*: switch to Godeps	2014-10-20 12:04:03 -07:00
Jonathan Boulle	106c4e7a2c	Merge pull request #249 from jonboulle/license_header *: add license header to all source files	2014-10-17 15:42:20 -07:00
Jonathan Boulle	6c1ba590aa	*: add license header to all source files	2014-10-17 15:36:22 -07:00
Alex Crawford	45da664c59	Merge pull request #246 from crawford/master Add support for Azure	2014-10-12 21:37:34 -07:00
Alex Crawford	2a71551ef2	azure: add support for azure (via azure agent)	2014-10-11 09:19:47 -07:00
Alex Crawford	84e1cb3242	datasource/waagent: add support for WAAgent metadata	2014-10-11 09:19:47 -07:00
Jonathan Boulle	5214ead926	Merge pull request #245 from jonboulle/units init: simplify CloudConfigUnit interface	2014-10-06 15:26:36 -07:00
Jonathan Boulle	e2c24c4cef	init: simplify CloudConfigUnit interface	2014-10-06 15:14:29 -07:00
Alex Crawford	75e288c553	coreos-cloudinit: bump to 0.10.4+git	2014-09-24 19:25:55 -07:00
Alex Crawford	0785840fe3	coreos-cloudinit: bump to 0.10.4	2014-09-24 19:25:34 -07:00
Alex Crawford	c10bfc2f56	Merge pull request #240 from epankala/euca4_compat_fix AWS: Eucalyptus 4.x compatibility fix	2014-09-24 10:55:39 -07:00
Janne Paenkaelae	2f954dcdc2	AWS: Eucalyptus 4.x compatibility fix For Eucalyptus 4.0.1 requesting metadata seem to work differently as with EC2. In Euca: > curl http://169.254.169.254/2009-04-04 <?xml version="1.0"?><Response><Errors><Error><Code>404 Not Found</Code><Message>unknown</Message></Error></Errors><RequestID>unknown</RequestID></Response>core@localhost ~ $ > curl http://169.254.169.254/2009-04-04/ dynamic meta-data user-data In AWS EC2 > curl http://169.254.169.254/2009-04-04 "" (zero bytes) > curl http://169.254.169.254/2009-04-04/ dynamic meta-data user-data As the isAvailable() function in metadata.go tests only for errorcode it fails in Euca.	2014-09-24 20:33:29 +03:00
Alex Crawford	cdfc94f4e9	Merge pull request #234 from crawford/validate config: explicitly specify fields and seperate config and application	2014-09-24 07:42:09 -07:00
Alex Crawford	18e2f98414	cloudconfig: refactor config - Move CloudConfig into config package - Add YAML tags to CloudConfig	2014-09-23 17:59:32 -07:00
Alex Crawford	4b472795c4	user: move User into config package - Add YAML tags for the fields	2014-09-23 17:59:19 -07:00
Alex Crawford	85b8d804c8	file: refactor config - Seperate the config from Permissions() - Add YAML tags for the fields	2014-09-23 17:59:16 -07:00
Alex Crawford	1fbbaaec19	unit: refactor config - Seperate the config from Destination() - Add YAML tags for the fields	2014-09-23 17:58:32 -07:00
Alex Crawford	667dbd8fb7	update: refactor config - Explicitly specify all of the valid options for Update - Seperate the config from File() and Units() - Add YAML tags for the fields	2014-09-23 17:57:43 -07:00
Alex Crawford	6730cb7227	oem: refactor the config - Seperate the config from File() - Add YAML tags for the fields	2014-09-23 16:08:23 -07:00
Alex Crawford	9454522033	fleet: refactor config - Explicitly specify all of the valid options for fleet - Seperate the config from Units() - Add YAML tags for the fields	2014-09-23 16:07:53 -07:00
Alex Crawford	c255739a93	etcd: refactor config - Explicitly specify all of the valid options for etcd - Remove the default name generation (ETCD_NAME is set by its unit file now) - Seperate the etcd config from Units() - Remove support for DISCOVERY_URL - Add YAML tags for the fields	2014-09-23 16:07:13 -07:00
Alex Crawford	2051cd3e1c	Merge pull request #238 from crawford/docs docs: fix documentation of coreos.units.command	2014-09-23 11:33:44 -07:00
Alex Crawford	b52cb3fea3	docs: fix documentation of coreos.units.command	2014-09-23 11:32:15 -07:00
Alex Crawford	da5f85b3fb	coreos-cloudinit: bump to 0.10.3+git	2014-09-17 12:19:27 -07:00
Alex Crawford	9999178538	coreos-cloudinit: bump to 0.10.3	2014-09-17 12:19:13 -07:00
Alex Crawford	8f766e4666	Merge pull request #235 from crawford/routes network: add support for CIDR addresses Debian routes	2014-09-17 12:18:16 -07:00
Alex Crawford	2d28d16c92	network: add support for CIDR addresses Debian routes OnMetal is changing their template from: `route add -net 1.2.3.0 netmask 255.255.255.0 gw 10.1.2.1 \|\| true` to: `route add -net 1.2.3.0/24 gw 10.1.2.1 \|\| true`	2014-09-16 17:36:34 -07:00
Alex Crawford	e9cd09dd7b	coreos-cloudinit: bump to 0.10.2+git	2014-09-14 08:19:57 -07:00
Alex Crawford	8370b30aa2	coreos-cloudinit: bump to 0.10.2	2014-09-14 08:19:33 -07:00
Alex Crawford	3e015cc3a1	Merge pull request #233 from crawford/configdrive configdrive: don't fail if no network config was provided	2014-09-14 08:18:14 -07:00
Alex Crawford	a0fe6d0884	configdrive: return an empty network config when filename is empty Additionally, don't bother checking for a network config if it isn't going to be processed.	2014-09-13 21:51:51 -07:00
Alex Crawford	585ce5fcd9	Revert "metadata: don't fail if no network config was provided" This reverts commit `c1f373e648`.	2014-09-13 21:01:42 -07:00
Alex Crawford	72445796ca	coreos-cloudinit: bump to 0.10.1+git	2014-09-12 16:48:15 -07:00
Alex Crawford	7342d91a85	coreos-cloudinit: bump to 0.10.1	2014-09-12 16:47:58 -07:00
Alex Crawford	db1bc51c98	Merge pull request #231 from crawford/netconf metadata: don't fail if no network config was provided	2014-09-12 16:35:24 -07:00
Alex Crawford	c1f373e648	metadata: don't fail if no network config was provided	2014-09-12 16:29:27 -07:00
Alex Crawford	db49a16002	coreos-cloudinit: bump to 0.10.0+git	2014-09-11 17:37:05 -07:00
Alex Crawford	a4a6c281d9	coreos-cloudinit: bump to 0.10.0	2014-09-11 17:36:38 -07:00
Alex Crawford	17f8733121	Merge pull request #228 from crawford/sub env: add support for escaping environment substitutions	2014-09-11 15:34:03 -07:00
Alex Crawford	7dec922618	env: add support for escaping environment substitutions	2014-09-11 15:30:33 -07:00
Alex Crawford	54d3ae27af	Merge pull request #226 from crawford/oem flags: add oem flag	2014-09-11 13:25:21 -07:00
Alex Crawford	ee2416af64	flags: move the flags into their own namespace	2014-09-11 12:00:17 -07:00
Alex Crawford	cda037f9a5	flags: add oem flag The oem flag will allow each of the OEMs to specify one flag only, acting as a shortcut to their specific configuration. This will allow us to update which options each OEM uses when running cloudinit.	2014-09-11 12:00:17 -07:00
Alex Crawford	549806cf64	Merge pull request #227 from crawford/ipv6 metadata: add support for IPv6 variable substitution	2014-09-11 10:45:33 -07:00
Alex Crawford	56815a6756	metadata: add support for IPv6 variable substitution	2014-09-11 10:43:02 -07:00
Alex Crawford	24a6f7c49c	Merge pull request #225 from crawford/exit userdata: change handling of bad userdata	2014-09-10 19:16:12 -07:00
Alex Crawford	98484be434	userdata: change handling of bad userdata Don't fail after encountering bad userdata. Continue processing the metadata and then exit. This will allow people with bad userdata to actually log in and see the error.	2014-09-10 17:50:23 -07:00
Jonathan Boulle	9024659296	Merge pull request #217 from ecnahc515/patch-1 Fix broken link to fleet config	2014-09-09 15:19:18 -07:00
Chance Zibolski	fc6940f7ba	Documentation: More specific link to fleet config. Add an anchor tag to the url to take person directly to config section.	2014-09-09 15:15:55 -07:00
Brian Waldon	f2fd95699b	Merge pull request #224 from bcwaldon/typo docs: fix a typo	2014-09-09 12:36:42 -07:00
bdevloed	65db96cc7c	docs: fix a typo	2014-09-09 12:31:54 -07:00
Alex Crawford	c17b93b5c0	Merge pull request #223 from crawford/yaml third_party: sync third_party/gopkg.in/yaml.v1	2014-09-08 19:28:59 -07:00
Alex Crawford	d352f8ce6a	Merge pull request #222 from crawford/contribute docs: Update maintainers and contribution guide	2014-09-08 15:54:30 -07:00
Alex Crawford	78aa2c56ec	yaml: replace goyaml with yaml	2014-09-08 13:25:27 -07:00
Alex Crawford	c5b3788282	third_party: sync third_party/gopkg.in/yaml.v1 Update launchpad.net/goyaml to gopkg.in/yaml.v1	2014-09-08 13:23:50 -07:00
Alex Crawford	5e98970bb5	docs: Update maintainers and contribution guide	2014-09-08 12:55:17 -07:00
Alex Crawford	cbdd446c55	Merge pull request #220 from crawford/docs docs: Update list of platforms supporting variable substitutions	2014-09-05 11:51:45 -07:00
Alex Crawford	316cadcf44	docs: Update list of platforms supporting variable substitutions	2014-09-04 12:57:19 -07:00
Alex Crawford	5a939be21b	coreos-cloudinit: bump to 0.9.6+git	2014-09-02 17:49:09 -07:00