chore(coreos-cloudinit): bump to 0.7.1

Merge pull request #119 from marineam/container
container and panic fixes
2014-05-16 21:21:47 -07:00 · 2014-05-16 21:19:43 -07:00 · 2014-05-16 20:38:49 -07:00 · 2014-05-16 20:38:49 -07:00 · 2014-05-16 18:22:22 -07:00
7 changed files with 27 additions and 12 deletions
--- a/coreos-cloudinit.go
+++ b/coreos-cloudinit.go
@@ -11,7 +11,7 @@ import (
 	"github.com/coreos/coreos-cloudinit/system"
 )

-const version = "0.7.0"
+const version = "0.7.1"

 func main() {
 	var printVersion bool
--- a/initialize/etcd.go
+++ b/initialize/etcd.go
@@ -31,6 +31,10 @@ func (ee EtcdEnvironment) String() (out string) {
 // Unit creates a Unit file drop-in for etcd, using any configured
 // options and adding a default MachineID if unset.
 func (ee EtcdEnvironment) Unit(root string) (*system.Unit, error) {
+	if ee == nil {
+		return nil, nil
+	}
+
 	if _, ok := ee["name"]; !ok {
 		if machineID := system.MachineID(root); machineID != "" {
 			ee["name"] = machineID
--- a/initialize/etcd_test.go
+++ b/initialize/etcd_test.go
@@ -152,3 +152,15 @@ Environment="ETCD_NAME=node007"
 		t.Fatalf("File has incorrect contents")
 	}
 }
+
+func TestEtcdEnvironmentWhenNil(t *testing.T) {
+	// EtcdEnvironment will be a nil map if it wasn't in the yaml
+	var ee EtcdEnvironment
+	if ee != nil {
+		t.Fatalf("EtcdEnvironment is not nil")
+	}
+	u, err := ee.Unit("")
+	if u != nil || err != nil {
+		t.Fatalf("Unit returned a non-nil value for nil input")
+	}
+}
--- a/units/configdrive-block.service
+++ b/units/configdrive-block.service
@@ -5,10 +5,6 @@ ConditionPathIsMountPoint=!/media/configdrive
 # Only mount config drive block devices automatically in virtual machines
 ConditionVirtualization=vm

-# OpenStack defined config drive so they get to stick their name in it
-Wants=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-Before=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-
 [Service]
 Type=oneshot
 RemainAfterExit=no
--- a/units/configdrive-virtfs.service
+++ b/units/configdrive-virtfs.service
@@ -4,10 +4,6 @@ Conflicts=configdrive-block.service umount.target
 ConditionPathIsMountPoint=!/media/configdrive
 ConditionVirtualization=vm

-# OpenStack defined config drive so they get to stick their name in it
-Wants=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-Before=user-cloudinit@media-configdrive-openstack-latest-user_data.service
-
 # Support old style setup for now
 Wants=addon-run@media-configdrive.service addon-config@media-configdrive.service
 Before=addon-run@media-configdrive.service addon-config@media-configdrive.service
--- a/units/user-cloudinit@.path
+++ b/units/user-cloudinit@.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Watch for a cloud-config at %f
+
+[Path]
+PathExists=%f
--- a/units/user-config.target
+++ b/units/user-config.target
@@ -3,9 +3,11 @@ Description=Load user-provided cloud configs
 Requires=system-config.target
 After=system-config.target

-# Load user_data placed by coreos-install
-Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
-After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
+# Watch for configs at a couple common paths
+Requires=user-cloudinit@media-configdrive-openstack-latest-user_data.path
+After=user-cloudinit@media-configdrive-openstack-latest-user_data.path
+Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path
+After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path

 Requires=user-cloudinit-proc-cmdline.service
 After=user-cloudinit-proc-cmdline.service
Author	SHA1	Message	Date
Michael Marineau	24f181f7a3	chore(coreos-cloudinit): bump to 0.7.1	2014-05-16 21:21:47 -07:00
Michael Marineau	61e70fcce8	Merge pull request #119 from marineam/container container and panic fixes	2014-05-16 21:19:43 -07:00
Michael Marineau	ea6262f0ae	fix(etcd): fix runtime panic when etcd section is missing. The etcd code tries to assign ee["name"] even when the map was never defined and assigning to an uninitialized map causes a panic.	2014-05-16 20:38:49 -07:00
Michael Marineau	f83ce07416	feat(units): Add generic cloudinit path unit Switch to triggering common user configs via a path unit. This is particularly useful for config drive so that a config drive can be mounted by something other than the udev triggered services, a bind mount when running in a container for example.	2014-05-16 20:38:49 -07:00
Brandon Philips	140682350d	chore(coreos-cloudinit): bump to 0.7.0+git	2014-05-16 18:22:22 -07:00