diff --git a/glide.lock b/glide.lock
index 4d2a54e2..a5119b17 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: d7d6d80b5734d981194ff7ff4cfa150cedae4549133301d1845f110e48729543
-updated: 2017-04-17T15:53:14.762097698-07:00
+hash: 205de0b66ed059a1f10d3fb36c7d465439818123940a9aaa68ddc71cc3bbfddd
+updated: 2017-04-17T17:09:48.864562358-07:00
 imports:
 - name: github.com/ajeddeloh/go-json
   version: 73d058cf8437a1989030afe571eeab9f90eebbbd
@@ -16,7 +16,7 @@ imports:
   - config/templating
   - config/types
 - name: github.com/coreos/coreos-cloudinit
-  version: 4c333e657bfbaa8f6594298b48324f45e6bf5961
+  version: 5be99bf577f2768193c7fb587ef5a8806c1503cf
   subpackages:
   - config
 - name: github.com/coreos/go-semver
diff --git a/glide.yaml b/glide.yaml
index 518a4dd5..0a225866 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -45,7 +45,7 @@ import:
   subpackages:
   - semver
 - package: github.com/coreos/coreos-cloudinit
-  version: v1.11.0
+  version: v1.13.0
   subpackages:
   - config
 - package: github.com/coreos/pkg
diff --git a/vendor/github.com/coreos/coreos-cloudinit/config/flannel.go b/vendor/github.com/coreos/coreos-cloudinit/config/flannel.go
index 7a953f8c..76ca695a 100644
--- a/vendor/github.com/coreos/coreos-cloudinit/config/flannel.go
+++ b/vendor/github.com/coreos/coreos-cloudinit/config/flannel.go
@@ -20,6 +20,8 @@ type Flannel struct {
 	EtcdCertFile  string `yaml:"etcd_certfile"  env:"FLANNELD_ETCD_CERTFILE"`
 	EtcdKeyFile   string `yaml:"etcd_keyfile"   env:"FLANNELD_ETCD_KEYFILE"`
 	EtcdPrefix    string `yaml:"etcd_prefix"    env:"FLANNELD_ETCD_PREFIX"`
+	EtcdUsername  string `yaml:"etcd_username"  env:"FLANNELD_ETCD_USERNAME"`
+	EtcdPassword  string `yaml:"etcd_password"  env:"FLANNELD_ETCD_PASSWORD"`
 	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"`
diff --git a/vendor/github.com/coreos/coreos-cloudinit/config/fleet.go b/vendor/github.com/coreos/coreos-cloudinit/config/fleet.go
index 970905cc..66c53bf6 100644
--- a/vendor/github.com/coreos/coreos-cloudinit/config/fleet.go
+++ b/vendor/github.com/coreos/coreos-cloudinit/config/fleet.go
@@ -25,6 +25,8 @@ type Fleet struct {
 	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"`
+	EtcdUsername            string  `yaml:"etcd_username"             env:"FLEET_ETCD_USERNAME"`
+	EtcdPassword            string  `yaml:"etcd_password"             env:"FLEET_ETCD_PASSWORD"`
 	Metadata                string  `yaml:"metadata"                  env:"FLEET_METADATA"`
 	PublicIP                string  `yaml:"public_ip"                 env:"FLEET_PUBLIC_IP"`
 	TokenLimit              int     `yaml:"token_limit"               env:"FLEET_TOKEN_LIMIT"`
diff --git a/vendor/github.com/coreos/coreos-cloudinit/config/locksmith.go b/vendor/github.com/coreos/coreos-cloudinit/config/locksmith.go
index aa1232d9..c261e356 100644
--- a/vendor/github.com/coreos/coreos-cloudinit/config/locksmith.go
+++ b/vendor/github.com/coreos/coreos-cloudinit/config/locksmith.go
@@ -19,6 +19,8 @@ type Locksmith struct {
 	EtcdCAFile         string `yaml:"etcd_cafile"   env:"LOCKSMITHD_ETCD_CAFILE"`
 	EtcdCertFile       string `yaml:"etcd_certfile" env:"LOCKSMITHD_ETCD_CERTFILE"`
 	EtcdKeyFile        string `yaml:"etcd_keyfile"  env:"LOCKSMITHD_ETCD_KEYFILE"`
+	EtcdUsername       string `yaml:"etcd_username" env:"LOCKSMITHD_ETCD_USERNAME"`
+	EtcdPassword       string `yaml:"etcd_password" env:"LOCKSMITHD_ETCD_PASSWORD"`
 	Group              string `yaml:"group"         env:"LOCKSMITHD_GROUP"`
 	RebootWindowStart  string `yaml:"window_start"  env:"REBOOT_WINDOW_START"  valid:"^((?i:sun|mon|tue|wed|thu|fri|sat|sun) )?0*([0-9]|1[0-9]|2[0-3]):0*([0-9]|[1-5][0-9])$"`
 	RebootWindowLength string `yaml:"window_length" env:"REBOOT_WINDOW_LENGTH" valid:"^[-+]?([0-9]*(\\.[0-9]*)?[a-z]+)+$"`
diff --git a/vendor/github.com/coreos/coreos-cloudinit/coreos-cloudinit.go b/vendor/github.com/coreos/coreos-cloudinit/coreos-cloudinit.go
index be613c39..d0d2c8a8 100644
--- a/vendor/github.com/coreos/coreos-cloudinit/coreos-cloudinit.go
+++ b/vendor/github.com/coreos/coreos-cloudinit/coreos-cloudinit.go
@@ -109,7 +109,6 @@ var (
 	oemConfigs = map[string]oemConfig{
 		"digitalocean": {
 			"from-digitalocean-metadata": "http://169.254.169.254/",
-			"convert-netconf":            "digitalocean",
 		},
 		"ec2-compat": {
 			"from-ec2-metadata": "http://169.254.169.254/",
@@ -170,11 +169,10 @@ func main() {
 	switch flags.convertNetconf {
 	case "":
 	case "debian":
-	case "digitalocean":
 	case "packet":
 	case "vmware":
 	default:
-		fmt.Printf("Invalid option to -convert-netconf: '%s'. Supported options: 'debian, digitalocean, packet, vmware'\n", flags.convertNetconf)
+		fmt.Printf("Invalid option to -convert-netconf: '%s'. Supported options: 'debian, packet, vmware'\n", flags.convertNetconf)
 		os.Exit(2)
 	}
 
@@ -256,8 +254,6 @@ func main() {
 		switch flags.convertNetconf {
 		case "debian":
 			ifaces, err = network.ProcessDebianNetconf(metadata.NetworkConfig.([]byte))
-		case "digitalocean":
-			ifaces, err = network.ProcessDigitalOceanNetconf(metadata.NetworkConfig.(digitalocean.Metadata))
 		case "packet":
 			ifaces, err = network.ProcessPacketNetconf(metadata.NetworkConfig.(packet.NetworkData))
 		case "vmware":