Merge ~chad.smith/cloud-init/+git/sru-info:sru-bug-updates into ~smoser/cloud-init/+git/sru-info:master

[Chad Smith]

couple of additional SRU bugs from May 2017 SRU.

diff --git a/bugs/1686514.txt b/bugs/1686514.txt
 new file mode 100644
index 0000000..2a6c74a
--- /dev/null
+++ b/bugs/1686514.txt
@@ -0,0 +1,39 @@
+http://pad.lv/1686514
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1686514
+    
+=== Begin SRU Template ===
+[Impact] 
+VMs on MS Azure have an ephemeral disk attached to them.  On first boot,
+the disk has a empty ntfs formated filesystem.  Cloud-init is expected
+to notice that the empty ntfs filesystem should be reformatted with
+a more linux-friendly ext4 filesystem.  This function is working as
+expected.
+
+However, the user can 'redeploy' a VM to a new azure host, or stop and
+deallocate the vm for some time and then restart/reallocate the vm.  After
+that operation, a pristine ephemeral disk is attached.  Cloud-init is
+expected to re-format this pristine ephemeral disk, but clearly not
+reformat a disk with user's data on it.  On large (L32) size VMs, azure
+presents a GPT formatted disk with 2 partitions where the second partition
+is ntfs.  Cloud-init currently does not consider disks with 2 partitions
+to be re-formattable.
+
+[Test Case]
+Test cases:
+ 1. Deploy an L32(s) VM on Azure
+ 2. Log in and ensure that the ephemeral disk is formatted and mounted to /mnt
+ 3. Via the portal you can "Redeploy" the VM to a new Azure Host (or alternatively stop and deallocate the VM for some time, and then restart/reallocate the VM).
+
+Expected Results:
+ - After reallocation we expect the ephemeral disk to be formatted and mounted to /mnt.
+
+Actual Results:
+ - After reallocation /mnt is not mounted and there are errors in the cloud-init log.
+
+[Regression Potential] 
+
+[Other Info]
+Upstream commit at
+  https://git.launchpad.net/cloud-init/commit/?id=XXXXXXXXXX
+
+=== End SRU Template ===
diff --git a/bugs/1692093.txt b/bugs/1692093.txt
 new file mode 100644
index 0000000..cfd0654
--- /dev/null
+++ b/bugs/1692093.txt
@@ -0,0 +1,33 @@
+http://pad.lv/1692093
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1692093
+    
+=== Begin SRU Template ===
+[Impact] 
+VMs on MS Azure have an ephemeral disk attached to them.
+On first boot, cloud-init properly notices the empty ntfs filesystem and
+reformats it ext4.
+
+After deallocating the instance or moving to a new azure host,
+the filesystem reformat is logged, but isn't actually performed because
+the udev device creation may not have settled.
+
+[Test Case]
+Test cases:
+ 1. Deploy an instance VM on Azure
+ 2. Log in and ensure that the ephemeral disk is formatted and mounted to /mnt
+ 3. Via the portal you can "Redeploy" the VM to a new Azure Host (or alternatively stop and deallocate the VM for some time, and then restart/reallocate the VM).
+
+Expected Results:a
+ - Check cloud-init.log expecting to see logs from cc_disk_setup about the mount.
+ - After reallocation we expect the ephemeral disk to be formatted and mounted to /mnt.
+
+Actual Results:
+ - After reallocation /mnt is not mounted and there are errors in the cloud-init log.
+
+[Regression Potential]
+
+[Other Info]
+Upstream commit at
+  https://git.launchpad.net/cloud-init/commit/?id=1815c6d801933c47a01f1a94a8e689824f6797b4
+
+=== End SRU Template ===
diff --git a/bugs/lp-1636531.txt b/bugs/lp-1636531.txt
 new file mode 100644
index 0000000..a374439
--- /dev/null
+++ b/bugs/lp-1636531.txt
@@ -0,0 +1,37 @@
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1636531
+http://pad.lv/1636531
+    
+=== Begin SRU Template ===
+[Impact]
+ Unit test updates to avoid leaking blkid calls from tests/unittests/test_datasource/test_altcloud.py.
+
+[Test Case]
+
+wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+chmod 755 lxc-proposed-snapshot
+
+
+# Create fake-blkid.sh
+cat fake-blkid.sh
+#!/bin/bash
+echo "LEAKED BLKID CALL"
+
+name=proposed-test
+for release in xenial yakkety zesty; do \
+ ref=$release-proposed;
+ lxc-proposed-snapshot --proposed --publish $release $ref;
+ lxc init $ref $name;
+ lxc start $name;
+ sleep 10;
+ lxc exec $name mv /sbin/blkid /sbin/blkid.orig;
+ lxc file push fake-flkid.sh $name/sbin/blkid
+ lxc exec $name git clone -b ubuntu/xenial https://git.launchpad.net/cloud-init 
+ tox -e py27 tests/unittests/test_datasource/test_altcloud.py | grep 'LEAKED BLKID';
+done
+ 
+[Regression Potential] 
+None. Unit test changes only
+
+[Other Info]
+
+=== End SRU Template ===
diff --git a/bugs/lp-1644064.txt b/bugs/lp-1644064.txt
 new file mode 100644
index 0000000..5fb23fb
--- /dev/null
+++ b/bugs/lp-1644064.txt
@@ -0,0 +1,41 @@
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1644064
+http://pad.lv/1644064
+    
+=== Begin SRU Template ===
+[Impact]
+Existing security permissions on /etc/ssh/sshd_config file not honored.
+
+[Test Case]
+if [ ! -f lxc-proposed-snapshot ]; then
+  wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+  chmod 755 lxc-proposed-snapshot
+fi
+
+cat << EOF > config.yaml
+#cloud-config
+ntp:
+  pools: [1.ntp.mypool]
+  servers: [my.server.nonpool]
+EOF
+
+for release in xenial yaketty zesty; do
+        ref=$release-proposed;
+        echo "$release START --------------";
+        ./lxc-proposed-snapshot --proposed --install ntp --publish $release $ref;
+        lxc init $ref test-$release;
+        lxc config set test-$release user.user-data - < config.yaml
+        lxc start test-$release;
+        sleep 10
+        # Should not see [0-3].ubuntu.pool.n
+        lxc exec test-$release -- ntpq -p
+        echo "$release DONE --------------";
+done
+
+ 
+[Regression Potential] 
+Minimal ntp service confguration could be stale if this breaks anything.
+It is minimal regression potential as the fix only reorders the creation of /etc/ntp.conf prior to the package intall and adds a call to service ntp restart.
+
+[Other Info]
+
+=== End SRU Template ===
diff --git a/bugs/lp-1645644.txt b/bugs/lp-1645644.txt
 new file mode 100644
index 0000000..3ba10bf
--- /dev/null
+++ b/bugs/lp-1645644.txt
@@ -0,0 +1,42 @@
+
+http://pad.lv/1645644
+http://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1645644
+
+
+=== Begin SRU Template ===
+[Impact]
+Existing security permissions on /etc/ssh/sshd_config file not honored.
+
+[Test Case]
+if [ ! -f lxc-proposed-snapshot ]; then
+  wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+  chmod 755 lxc-proposed-snapshot
+fi
+
+cat << EOF > config.yaml
+#cloud-config
+ntp:
+  pools: [1.ntp.mypool]
+  servers: [my.server.nonpool]
+EOF
+
+for release in xenial yakkety zesty; do
+        ref=$release-proposed;
+        echo "$release START --------------";
+        ./lxc-proposed-snapshot --proposed --install ntp --publish $release $ref;
+        lxc init $ref test-$release;
+        lxc config set test-$release user.user-data - < config.yaml
+        lxc start test-$release;
+        sleep 10
+        # Should not see [0-3].ubuntu.pool.n
+        lxc exec test-$release -- ntpq -p
+        echo "$release DONE --------------";
+done
+
+[Regression Potential]
+Minimal ntp service confguration could be stale if this breaks anything.
+It is minimal regression potential as the fix only reorders the creation of /etc/ntp.conf prior to the package intall and adds a call to service ntp restart.
+
+[Other Info]
+
+=== End SRU Template ===
diff --git a/bugs/lp-1673637.txt b/bugs/lp-1673637.txt
 new file mode 100644
index 0000000..e1cec15
--- /dev/null
+++ b/bugs/lp-1673637.txt
@@ -0,0 +1,46 @@
+http://pad.lv/1673637
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1673637
+    
+=== Begin cloud-init SRU Template ===
+[Impact]
+Softcloud user datasource is undetected when only openstack/latest config-drive is provided.
+
+[Test Case]
+
+For cloud-init, the easiest way to demonstrate this is to
+create a lxc container and populate it with a '/config-drive' that only contains a openstack/latest path.
+
+wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+chmod 755 lxc-proposed-snapshot
+wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/tools/make-configdrive-dir
+chmod 755 make-configdrive-dir
+name=test-proposed
+
+for release in xenial yaketty zesty; do
+ ref=$release-proposed;
+ ./lxc-proposed-snapshot --proposed --publish $release $ref;
+ ./lxc init $ref $name;
+
+## populate a /config-drive with attached 'make-config-drive-dir'
+## and push it to the container
+
+ d=$(mktemp -d)
+ ./make-configdrive-dir "$d" "$name"
+ rm -Rf "$d"
+ lxc file pull $name/etc/cloud/cloud.cfg.d/90_dpkg.cfg - |
+    sed 's/NoCloud, //' |
+    lxc file push - $name/etc/cloud/cloud.cfg.d/90_dpkg.cfg;
+ 
+
+ lxc start $name
+ sleep 10
+ lxc exec $name cp -r /config-drive /var/lib/cloud/seed/config_drive
+ lxc exec $name rm -rf /var/lib/cloud/seed/config_drive/openstack/2015-10-15
+ lxc exec $name sudo DEBUG_LEVEL=2 DI_LOG=stderr /usr/lib/cloud-init/ds-identify --force 2>&1 | grep latest
+
+
+[Regression Potential] 
+
+[Other Info]
+
+=== End cloud-init SRU Template ===
diff --git a/bugs/lp-1676908.txt b/bugs/lp-1676908.txt
 new file mode 100644
index 0000000..46b30a3
--- /dev/null
+++ b/bugs/lp-1676908.txt
@@ -0,0 +1,42 @@
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1676908
+http://pad.lv/1676908
+    
+=== Begin SRU Template ===
+[Impact]
+DigitalOcean instances are unable to bind nameserves to multiple interfaces.
+
+[Test Case]
+
+wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+chmod 755 lxc-proposed-snapshot
+
+
+# create config.yaml
+cat config.yaml
+#cloud-config
+ssh_pwauth: true
+
+name=proposed-test
+for release in xenial yakkety zesty; do \
+ ref=$release-proposed;
+ lxc-proposed-snapshot --proposed --publish $release $ref;
+ lxc init $ref $name;
+ lxc start $name;
+ sleep 10;
+ lxc file pull $name/etc/ssh/sshd_config .;
+ chmod 600 sshd_config;
+ lxc file push sshd_config $name/etc/ssh/sshd_config;
+ lxc config set $name user.user-data - < config.yml;
+ lxc start;
+ sleep 10;
+ lxc exec $name ls -ltr /etc/ssh/sshd_config;  # should remain 600
+ lxc stop $name;
+ lxc delete $name;
+done
+ 
+[Regression Potential] 
+Minimal as we are now honoring file permissions if an sshd_config file exists.
+
+[Other Info]
+
+=== End SRU Template ===
diff --git a/bugs/lp-1681531.txt b/bugs/lp-1681531.txt
 new file mode 100644
index 0000000..7ed04e7
--- /dev/null
+++ b/bugs/lp-1681531.txt
@@ -0,0 +1,64 @@
+http://pad.lv/1681531
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1681531
+
+
+[Impact]
+The cloud-init datasource for DigitalOcean allows for multiple gateways on any NIC.
+
+On Ubuntu 16.04, this breaks networking.service. For 17.04 and later, Ubuntu _replaces_ the default gateway with the second gateway on 'ifup' after reboot.
+
+DigitalOcean is looking at changing the meta-data, however, this will result in another version of the meta-data JSON.
+
+[Regression Potential]
+
+Low. This change is scope to DigitalOcean only. DigitalOcean has tested this Datasource exhaustively.
+
+[TEST Cases]
+- provision on DigitalOcean with a private IP
+- reboot
+- confirm that a single route exists in /etc/network/interfaces
+
+[LOGS]
+
+----------------------------------------------------------------------------------------------
+From /var/log/cloud-init.log:
+
[phone]:36:11,608 - util.py[DEBUG]: Running command ['ip', 'link', 'set', 'ens3', 'down'] with allowed return codes [0] (shell=False, capture=True)
[phone]:36:11,615 - util.py[DEBUG]: Running command ['ip', 'link', 'set', 'ens3', 'name', 'eth0'] with allowed return codes [0] (shell=False, capture=True)
[phone]:36:11,635 - util.py[DEBUG]: Running command ['ip', 'link', 'set', 'ens4', 'name', 'eth1'] with allowed return codes [0] (shell=False, capture=True)
[phone]:36:11,651 - util.py[DEBUG]: Running command ['ip', 'link', 'set', 'eth0', 'up'] with allowed return codes [0] (shell=False, capture=True)
[phone]:36:11,654 - stages.py[INFO]: Applying network configuration from ds bringup=False: {'version': 1, 'config': [{'name': 'eth0', 'subnets': [{'address': '138.197.88.85', 'netmask': '255.255.240.0', 'gateway': '138.197.80.1', 'type': 'static', 'control': 'auto'}, {'address': '2604:A880:0800:0010:0000:0000:2ECE:D001/64', 'gateway': '2604:A880:0800:0010:0000:0000:0000:0001', 'type': 'static', 'control': 'auto'}, {'address': '10.17.0.10', 'netmask': '255.255.0.0', 'type': 'static', 'control': 'auto'}], 'mac_address': 'ee:90:f2:c6:dc:db', 'type': 'physical'}, {'name': 'eth1', 'subnets': [{'address': '10.132.92.131', 'netmask': '255.255.0.0', 'gateway': '10.132.0.1', 'type': 'static', 'control': 'auto'}], 'mac_address': '1a:b6:7c:24:5e:cd', 'type': 'physical'}, {'address': ['2001:4860:4860::8844', '2001:4860:4860::8888', '8.8.8.8'], 'type': 'nameserver'}]}
[phone]:36:11,668 - util.py[DEBUG]: Writing to /etc/network/interfaces.d/50-cloud-init.cfg - wb: [420] 868 bytes
[phone]:36:11,669 - main.py[DEBUG]: [local] Exiting. datasource DataSourceDigitalOcean not in local mode.
[phone]:36:11,674 - util.py[DEBUG]: Reading from /proc/uptime (quiet=False)
+
+----------------------------------------------------------------------------------------------
+From 'dmesg':
+Apr 10 17:36:11 ubuntu systemd[1]: Started Initial cloud-init job (pre-networking).
+Apr 10 17:36:12 ubuntu systemd[1]: Started LSB: AppArmor initialization.
+Apr 10 17:36:12 ubuntu systemd[1]: Reached target Network (Pre).
+Apr 10 17:36:12 ubuntu systemd[1]: Starting Raise network interfaces...
+Apr 10 17:36:13 ubuntu ifup[1099]: Waiting for DAD... Done
+Apr 10 17:36:13 ubuntu ifup[1099]: RTNETLINK answers: File exists
+Apr 10 17:36:13 ubuntu ifup[1099]: Failed to bring up eth1.
+
+----------------------------------------------------------------------------------------------
+$ sudo journalctl -xe -u networking
+Apr 10 17:36:12 ubuntu systemd[1]: Starting Raise network interfaces...
+-- Subject: Unit networking.service has begun start-up
+-- Defined-By: systemd
+-- Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+--
+-- Unit networking.service has begun starting up.
+Apr 10 17:36:13 ubuntu ifup[1099]: Waiting for DAD... Done
+Apr 10 17:36:13 ubuntu ifup[1099]: RTNETLINK answers: File exists
+Apr 10 17:36:13 ubuntu ifup[1099]: Failed to bring up eth1.
+Apr 10 17:36:13 ubuntu systemd[1]: networking.service: Main process exited, code=exited, status=1/FAILURE
+Apr 10 17:36:13 ubuntu systemd[1]: Failed to start Raise network interfaces.
+-- Subject: Unit networking.service has failed
+-- Defined-By: systemd
+-- Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+--
+-- Unit networking.service has failed.
+--
+
diff --git a/bugs/lp-1682160.txt b/bugs/lp-1682160.txt
 new file mode 100644
index 0000000..d794a45
--- /dev/null
+++ b/bugs/lp-1682160.txt
@@ -0,0 +1,34 @@
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1682160
+http://pad.lv/1674766
+    
+=== Begin SRU Template ===
+[Impact]
+update-grub-legacy-ec2 fails on system with missing /etc/fstab.
+
+[Test Case]
+
+Mimic missing /etc/fstab config using lxc-proposed-snapshot from 
+  https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/tree/bin/lxc-proposed-snapshot
+
+It publishes an image to lxd with proposed enabled and cloud-init upgraded.
+
+$ for release in xenial yakkety zesty; do
+$ ref=$release-proposed
+$ lxc-proposed-snapshot --proposed --publish $release $ref
+$ lxc init $ref $name
+$ lxc start $name
+$ sleep 10
+$ lxc exec $name apt install grub-legacy-ec2
+$ lxc exec $name mv /etc/fstab /etc/fstab.orig
+$ lxc exec $name dpkg-reconfigure grub-legacy-ec2
+
+# Ensure error message does not exist "This error is probably caused by an invalid /etc/fstab"
+
+[Regression Potential] 
+Low. oneliner in a script
+
+[Other Info]
+Upstream commit:
+ https://git.launchpad.net/cloud-init/commit/?id=fd9f36267541
+
+=== End SRU Template ===
diff --git a/bugs/lp-1684349.txt b/bugs/lp-1684349.txt
 new file mode 100644
index 0000000..718eb75
--- /dev/null
+++ b/bugs/lp-1684349.txt
@@ -0,0 +1,181 @@
+http://pad.lv/1684349
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1684349
+
+
+=== Begin SRU Template ===
+[Impact]
+On Openstack instances, when rendering sysconfig output, cloud-init
+would stacktrace due to a TypeError.
+This affects runtime only when rendering sysconfig networking, which
+is what is used on CentOS and RedHat systems.
+
+[Test Case]
+The basic idea below is:
+ a.) launch an instance with proposed version of cloud-init.
+ b.) inside instance, get cloud-init's network rendering tool from trunk
+ c.) run the rendering tool against a config that failed before.
+ d.) check rendered netplan config to verify it has the correct format.
+     The failed output would have 'addresses' with a format like:
+     172.19.1.34/255.255.255.0
+     The expected output would be 'cidr' format:
+     172.19.1.34/24
+
+## launch an instance.
+$ release=xenial
+$ ref=$release-proposed
+$ lxc-proposed-snapshot --proposed --publish $release $ref
+$ lxc launch $ref $name
+$ lxc exec $name
+
+## get render tool
+% wget https://git.launchpad.net/~cloud-init-dev/cloud-init/plain/tools/net-convert.py -O net-convert.py
+
+## write the network_data.json
+% cat > simple-ipv6.yaml <<EOF
+version: 1
+config:
+  - type: physical
+    name: eth0
+    subnets:
+     - type: static
+       address: "2000:192:168::5"
+       netmask: 64
+       routes:
+        - netmask: 0
+          gateway: "2000:192:168::1"
+          network: "::"
+EOF
+
+## run the converter
+% ./net-convert.py --network-data=simple-ipv6.yaml \
+     --kind=yaml --output-kind=eni --directory=out.d
+
+## check the output
+% cat out.d/etc/network/interfaces
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet6 static
+    address 2000:192:168::5
+    netmask 64
+    post-up route add -A inet6 default gw 2000:192:168::1 || true
+    pre-down route del -A inet6 default gw 2000:192:168::1 || true
+
+## show the cloud-init versions
+% dpkg-query --show cloud-init
+...
+
+[Regression Potential]
+The fix here was just to make a common networking method accept
+a string input as intended rather than only an integer.
+
+The common code changes could shake out other failures in the networking
+path.
+
+[Other Info]
+Upstream commit at
+  https://git.launchpad.net/cloud-init/commit/?id=16a7302f6a
+
+lxc-proposed-snapshot is
+  https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/tree/bin/lxc-proposed-snapshot
+It publishes an image to lxd with proposed enabled and cloud-init upgraded.
+=== End SRU Template ===
+
+mask2cidr error with integer value - argument of type 'int' is not iterable
+
+~~~
+def mask2cidr(mask):
+    if ':' in str(mask):
+        return ipv6mask2cidr(mask)
+    elif '.' in mask:
+        return ipv4mask2cidr(mask)
+    else:
+        return mask
+~~~
+
+is not type safe. It tries to take into account that this can be a prefix (so it does not contain ':' not '.' and then return mask. The problem is that if mask is an integer, then this returns:
+
+~~~
+Traceback (most recent call last):
+  File "/usr/lib/python2.7/site-packages/cloudinit/cmd/main.py", line 513, in status_wrapper
+    ret = functor(name, args)
+  File "/usr/lib/python2.7/site-packages/cloudinit/cmd/main.py", line 269, in main_init
+    init.apply_network_config(bring_up=bool(mode != sources.DSMODE_LOCAL))
+  File "/usr/lib/python2.7/site-packages/cloudinit/stages.py", line 641, in apply_network_config
+    return self.distro.apply_network_config(netcfg, bring_up=bring_up)
+  File "/usr/lib/python2.7/site-packages/cloudinit/distros/__init__.py", line 150, in apply_network_config
+    dev_names = self._write_network_config(netconfig)
+  File "/usr/lib/python2.7/site-packages/cloudinit/distros/rhel.py", line 59, in _write_network_config
+    ns = parse_net_config_data(netconfig)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 32, in parse_net_config_data
+    nsi.parse_config(skip_broken=skip_broken)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 205, in parse_config
+    handler(self, command)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 78, in decorator
+    return func(self, command, *args, **kwargs)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 239, in handle_physical
+    subnet['netmask'] = mask2cidr(subnet['netmask'])
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 441, in mask2cidr
+    elif '.' in mask:
+~~~
+
+Made a modification to the code to troubleshoot this:
+~~~
+       # convert subnet ipv6 netmask to cidr as needed
+        subnets = command.get('subnets')
+        print subnets
+        if subnets:
+            for subnet in subnets:
+                if subnet['type'] == 'static':
+                    if 'netmask' in subnet and ':' in subnet['address']:
+                        subnet['netmask'] = mask2cidr(subnet['netmask'])
+                        for route in subnet.get('routes', []):
+                            if 'netmask' in route:
+                                route['netmask'] = mask2cidr(route['netmask'])
+~~~
+
+This error can be hit on RHEL when running the following 2x (don't know why 2x):
+
+ rm -Rf /var/lib/cloud/data/*  ; cloud-init --force init
+
+On the second run, this will be returned:
+~~~
+Traceback (most recent call last):
+  File "/usr/lib/python2.7/site-packages/cloudinit/cmd/main.py", line 513, in status_wrapper
+    ret = functor(name, args)
+  File "/usr/lib/python2.7/site-packages/cloudinit/cmd/main.py", line 269, in main_init
+    init.apply_network_config(bring_up=bool(mode != sources.DSMODE_LOCAL))
+  File "/usr/lib/python2.7/site-packages/cloudinit/stages.py", line 641, in apply_network_config
+    return self.distro.apply_network_config(netcfg, bring_up=bring_up)
+  File "/usr/lib/python2.7/site-packages/cloudinit/distros/__init__.py", line 150, in apply_network_config
+    dev_names = self._write_network_config(netconfig)
+  File "/usr/lib/python2.7/site-packages/cloudinit/distros/rhel.py", line 59, in _write_network_config
+    ns = parse_net_config_data(netconfig)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 32, in parse_net_config_data
+    nsi.parse_config(skip_broken=skip_broken)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 205, in parse_config
+    handler(self, command)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 78, in decorator
+    return func(self, command, *args, **kwargs)
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 239, in handle_physical
+    subnet['netmask'] = mask2cidr(subnet['netmask'])
+  File "/usr/lib/python2.7/site-packages/cloudinit/net/network_state.py", line 441, in mask2cidr
+    elif '.' in mask:
+TypeError: argument of type 'int' is not iterable
+------------------------------------------------------------
+[{u'routes': [{u'netmask': u'0.0.0.0', u'network': u'0.0.0.0', u'gateway': u'192.168.0.1'}], u'netmask': u'255.255.255.0', u'type': 'static', 'ipv4': True, 'address': u'192.168.0.11'}, {u'routes': [{u'netmask': 0, u'network': u'::', u'gateway': u'2000:192:168::1'}], u'netmask': 64, 'ipv6': True, u'type': 'static', 'address': u'2000:192:168::4'}]
+~~~
+
+not the `u'netmask': 64` integer
+
+This can be fixed by changing the code to:
+~~~
+def mask2cidr(mask):
+    if ':' in str(mask):
+        return ipv6mask2cidr(mask)
+    elif '.' in str(mask):
+        return ipv4mask2cidr(mask)
+    else:
+        return mask
+~~~
diff --git a/bugs/lp-1685810.txt b/bugs/lp-1685810.txt
 new file mode 100644
index 0000000..b15f7a3
--- /dev/null
+++ b/bugs/lp-1685810.txt
@@ -0,0 +1,40 @@
+http://pad.lv/1685810
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1685810
+    
+=== Begin SRU Template ===
+[Impact]
+Warning message for nova-lxd images in openstack clouds due to no valid datasource found.
+
+[Test Case]
+# It downloads a cloud image of a given release, and then creates a -proposed
+image with cloud-init upgraded.
+wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+chmod 755 get-proposed-image
+
+source novarc
+
+for release in xenial yakkety zesty do;
+ ref=$release-proposed;
+ lxc-proposed-snapshot --proposed --publish $release $ref;
+ lxc image export $ref .;
+ imagefile=`ls -tr *gz | tail -n 1`
+ mkdir $ref;
+ cd $ref;
+ tar -zxvf ../$imagefile;
+ cd rootfs;
+ tar zcvf $ref.tar.gz *;
+ #upload raw image to your cloud
+  openstack image create --disk-format raw --container-format bare --file $ref.tar.gz testing/$ref.tar.gz;
+  openstack server create --image testing/$ref.tar.gz --flavor=m1.tiny lxd-$release --key-name <your-key>;
+  nova floating-ip-create;
+  nova foating-ip-associate <server> <address>;
+  ssh ubuntu@<address> 'sudo DEBUG_LEVEL=2 DI_LOG=stderr /usr/lib/cloud-init/ds-identify --force 2>&1 | grep Found';   # single datasource: OpenStack
+done
+  
+[Regression Potential]
+Low as this only addresses the warning by correctly identifying the OpenStack cloud datasource.
+
+
+[Other Info]
+
+=== End SRU Template ===
diff --git a/bugs/lp-1685935.txt b/bugs/lp-1685935.txt
 new file mode 100644
index 0000000..4d4fb50
--- /dev/null
+++ b/bugs/lp-1685935.txt
@@ -0,0 +1,18 @@
+
+http://pad.lv/1685935
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1685935
+
+
+=== Begin SRU Template ===
+[Impact]
+Minor tweak to Makefile target make deb to announce missing devscripts package dependency in developer environments.
+
+[Test Case]
+No test case as this Makefile and related bddeb script are developer tools and aren't part of cloud-init deb package.
+
+[Regression Potential]
+None
+[Other Info]
+
+=== End SRU Template ===
+
diff --git a/bugs/lp-1687485.txt b/bugs/lp-1687485.txt
 new file mode 100644
index 0000000..4dd858f
--- /dev/null
+++ b/bugs/lp-1687485.txt
@@ -0,0 +1,24 @@
+http://pad.lv/1687485
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1687485
+
+
+=== Begin SRU Template ===
+[Impact]
+This code path is not applicable to Ubuntu.
+The bug resolved properly detecting and raising ValueErrors if multiple default
+gateways were defined in ipv4 or or ipv6 addresses for sysconfig
+(Redhat/centos) format.
+
+[Test Case]
+Launch an instance on lxd, make sure it has network.
+
+[Regression Potential]
+Changes to network rendering could have negatively affected Ubuntu
+the test above is valid to check that that didn't go horribly wrong.
+
+[Other Info]
+Upstream commit:
+ https://git.launchpad.net/cloud-init/commit/?id=dd03bb411c9a6f10854a3bbc3223b204c3d4d174
+
+=== End SRU Template ===
+
diff --git a/bugs/lp-1689346.txt b/bugs/lp-1689346.txt
 new file mode 100644
index 0000000..1b191bb
--- /dev/null
+++ b/bugs/lp-1689346.txt
@@ -0,0 +1,121 @@
+http://pad.lv/1689346
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1689346
+
+
+=== Begin SRU Template ===
+[Impact]
+On Openstack instances, cloud-init incorrectly rendered netplan
+configuration files.  The result is that networking does not work
+as expected.
+
+Note that this is not a default configuration on any Ubuntu provided images.
+Default images use ifupdown (eni) rendering which did not have this issue.
+
+[Test Case]
+The basic idea below is:
+ a.) launch an instance with proposed version of cloud-init.
+ b.) inside instance, get cloud-init's network rendering tool from trunk
+ c.) run the rendering tool against a config that failed before.
+ d.) check rendered netplan config to verify it has the correct format.
+     The failed output would have 'addresses' with a format like:
+     172.19.1.34/255.255.255.0
+     The expected output would be 'cidr' format:
+     172.19.1.34/24
+
+## launch an instance.
+$ release=xenial
+$ ref=$release-proposed
+$ lxc-proposed-snapshot --proposed --publish $release $ref
+$ lxc init $ref $name
+
+## get render tool
+$ wget https://git.launchpad.net/~cloud-init-dev/cloud-init/plain/tools/net-convert.py -O net-convert.py
+
+## write the network_data.json
+$ cat >network_data.json <<EOF
+{
+ "links": [
+  {"ethernet_mac_address": "aa:ab:ac:ad:ae:00",
+   "id": "tap1a", "type": "phy", "vif_id": "1a81968a"}
+ ],
+ "networks": [
+   {"id": "network0", "ip_address": "172.19.1.34", "link": "tap1a",
+    "netmask": "255.255.255.0", "network_id": "dacd568d", "type": "ipv4",
+    "routes": [
+     {"gateway": "172.19.3.254", "netmask": "0.0.0.0",
+      "network": "0.0.0.0"}]}
+ ],
+ "services": [{"address": "172.19.0.12", "type": "dns"}]
+}
+EOF
+
+## run the converter
+$ ./net-convert.py --network-data=network_data.json \
+     --kind=network_data.json --output-kind=netplan \
+     -m eth1,aa:ab:ac:ad:ae:00 --directory=./out.d 
+
+
+## check the output
+$ cat out.d/etc/netplan/50-cloud-init.yaml
+network:
+    version: 2
+    ethernets:
+        eth1:
+            addresses:
+            - 172.19.1.34/24
+            match:
+                macaddress: aa:ab:ac:ad:ae:00
+            nameservers:
+                addresses:
+                - 172.19.0.12
+            routes:
+            -   to: 0.0.0.0/0
+                via: 172.19.3.254
+            set-name: eth1
+
+## show the cloud-init versions
+$ dpkg-query --show cloud-init
+...
+
+[Regression Potential] 
+The change is fairly safe in that it basically renders:
+  172.19.1.34/24
+instead of
+  172.19.1.34/255.255.255.0
+
+The previous rendering just plain did not work as it is not valid
+input for netplan.  So the regression path there should be low.
+
+The common code changes could shake out other failures in the networking
+path.
+
+[Other Info]
+Upstream commit at
+  https://git.launchpad.net/cloud-init/commit/?id=16a7302f6a
+
+lxc-proposed-snapshot is
+  https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/tree/bin/lxc-proposed-snapshot
+It publishes an image to lxd with proposed enabled and cloud-init upgraded.
+=== End SRU Template ===
+
+
+networking data josn has:
+
+"ip_address" : "104.130.20.155",
+"netmask" : "255.255.255.0"
+
+"ip_address" : "10.184.3.234",
+"netmask" : "255.255.240.0",
+
+that got rendered into nplan as:
+ - 104.130.20.155/255.255.255.0
+ - 10.184.3.234/255.255.240.0
+
+which it failed to parse
+
+Stderr: Error in network definition //etc/netplan/50-cloud-init.yaml line 32 column 12: invalid prefix length in address '104.130.20.155/255.255.255.0'
+
+I believe nplan is expecing CIDR notation of /24 or some such. I belive the current plan is to fix cloud-init to generate /24 cidr notation in the nplan renderer.
+
+This needs SRU into xenial.
+
diff --git a/bugs/lp-1689944.txt b/bugs/lp-1689944.txt
 new file mode 100644
index 0000000..4b4daaf
--- /dev/null
+++ b/bugs/lp-1689944.txt
@@ -0,0 +1,136 @@
+http://pad.lv/1689944
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1689944
+
+
+=== Begin SRU Template ===
+[Impact]
+Cloud-init when running in Ubuntu core does not recognize it is
+running on a 'snappy.  As a result the snappy specific code paths are not
+taken.
+
+[Test Case]
+There are fairly extensive unit tests added to cover the code path
+that has been added to detect when system is snappy.  See the upstream
+commit link below for that.  Those tests run on package build, so
+the fact that this is in the archive means those have run.
+
+In addition to that we will:
+a.) boot an instance of Ubuntu in lxd with cloud-init from proposed
+    to verify it is not regressed.
+b.) craft an lxd instance with /etc/os-release that appears to be snappy.
+    and then verify via log inspection that it thinks it is.
+
+The test is admittedly superficial, the real end test is having cloud-init
+inside a ubuntu core image and it recognizing that it is snappy there.
+That test is much more involved.
+
+## launch an instance
+$ release=xenial
+$ ref=$release-proposed
+$ lxc-proposed-snapshot --proposed --publish $release $ref
+$ lxc launch $ref $name
+$ lxc exec $name
+
+## let it boot
+$ sleep 10
+## check log for warnings
+$ lxc exec $name -- cat /run/cloud-init/result.json
+{
+ "v1": {
+  "datasource": "DataSourceNoCloud [seed=/var/lib/cloud/seed/nocloud-net][dsmode=net]",
+  "errors": []
+ }
+}
+
+$ lxc exec $name -- grep WARN /var/log/cloud-init.log || echo no warnings
+no warnings
+
+
+## write to /etc/os-release so it thinks it is Ubuntu core.
+$ lxc exec $name -- sh -c 'echo ID=ubuntu-core >> /etc/os-release'
+$ lxc exec $name -- sh -c 'd=/etc/system-image; mkdir -p $d; cd $d; echo ubuntu-core > channel.ini'
+
+## Now clear the instance state so it thinks it is first boot.
+$ lxc exec $name -- sh -c 'rm -Rf /var/log/cloud-init*'
+$ lxc exec $name -- sh -xec 'cd /var/lib/cloud; mv seed .x; rm -Rf *; mv .x seed'
++ cd /var/lib/cloud
++ mv seed .x
++ rm -Rf data handlers instance instances scripts sem
++ mv .x seed
+
+$ lxc restart $name
+$ sleep 10
+$ lxc exec $name -- grep "running on snappy" /var/log/cloud-init.log
[phone]:53:24,346 - cc_apt_configure.py[DEBUG]: Nothing to do: No apt config and running on snappy
+
+[Regression Potential] 
+The regression potential would be
+a.) cloud-init falsely identifies it is running on snappy when it is not.
+b.) cloud-init does not recognize it is on snappy when it is.
+
+[Other Info]
+Upstream commit at
+  https://git.launchpad.net/cloud-init/commit/?id=4bcc947301b
+
+lxc-proposed-snapshot is
+  https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/tree/bin/lxc-proposed-snapshot
+It publishes an image to lxd with proposed enabled and cloud-init upgraded.
+
+=== End SRU Template ===
+
+Recent core snap images (edge channel revision 1886) do not contain the previously known files used to detect that a system is ubuntu core.
+
+In this bug, we should collect as many known paths/files/commands so we're hopefully defensive against further changes.
+
+Ubuntu Core 16
+--------------
+% cat etc/os-release
+NAME="Ubuntu Core"
+VERSION="16"
+ID=ubuntu-core
+PRETTY_NAME="Ubuntu Core 16"
+VERSION_ID="16"
+HOME_URL="http://www.snapcraft.io/"
+BUG_REPORT_URL="http://bugs.launchpad.net/snappy/"
+
+% snap version
+snap    2.24+201704201952.git.2ba71ec~ubuntu16.04.1
+snapd   2.24+201704201952.git.2ba71ec~ubuntu16.04.1
+series  16
+kernel  4.4.0-59-generic
+
+% lsb_release -rd
+bash: lsb_release: command not found
+
+% test -e /writable/system-data/var/lib/snapd; echo $?
+0
+
+Ubuntu 16.04 (Classic)
+-----------------------
+ % cat /etc/os-release
+NAME="Ubuntu"
+VERSION="16.04.2 LTS (Xenial Xerus)"
+ID=ubuntu
+ID_LIKE=debian
+PRETTY_NAME="Ubuntu 16.04.2 LTS"
+VERSION_ID="16.04"
+HOME_URL="http://www.ubuntu.com/"
+SUPPORT_URL="http://help.ubuntu.com/"
+BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"
+VERSION_CODENAME=xenial
+UBUNTU_CODENAME=xenial
+
+% snap version
+snap    unknown
+snapd   2.24.1
+series  16
+ubuntu  16.04
+kernel  4.4.0-75-generic
+
+% lsb_release -rd
+Description:	Ubuntu 16.04.2 LTS
+Release:	16.04
+
+% test -e /writable/system-data/var/lib/snapd; echo $?
+1
+
diff --git a/bugs/lp-1691551.txt b/bugs/lp-1691551.txt
 new file mode 100644
index 0000000..ed3e18f
--- /dev/null
+++ b/bugs/lp-1691551.txt
@@ -0,0 +1,41 @@
+http://pad.lv/1691551
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1691551
+
+
+=== Begin SRU Template ===
+[Impact]
+Warnings are not suppressed when /var/lib/cloud/instance/warnings/.skip exists.
+
+[Test Case]
+if [ ! -f lxc-proposed-snapshot ]; then
+  wget https://git.launchpad.net/~smoser/cloud-init/+git/sru-info/plain/bin/lxc-proposed-snapshot
+  chmod 755 lxc-proposed-snapshot
+fi
+
+for release in xenial yakkety zesty; do
+        ref=$release-proposed;
+        echo "$release START --------------";
+        ./lxc-proposed-snapshot --proposed --install ntp --publish $release $ref;
+        lxc init $ref test-$release;
+        lxc start test-$release;
+        sleep 10
+        # Create a warning
+        lxc exec test-$release -- sh -c 'd=/var/lib/cloud/instance/warnings/; mkdir -p $d; echo "WARNING WARNING FOO" > "$d/warn-foo"'
+        # Validate warning exists
+        echo -n "Warning should exist on login: "
+        lxc exec test-$release -- bash --login </dev/null 2>&1 | grep WARNING
+        lxc exec test-$release -- touch /var/lib/cloud/instance/warnings/.skip
+        echo -n "Warning should now be suppressed on login: "
+        lxc exec test-$release -- bash --login </dev/null 2>&1 | grep WARNING
+        echo "$release DONE --------------";
+done
+
+[Regression Potential]
+Minimal as the alternative warning suppression file works if you touch /root/.cloud-warnings.skip
+
+[Other Info]
+Upstream commit:
+ https://git.launchpad.net/cloud-init/commit/?id=66e46d8ec290737fd74f50eb8c7672d627d9b516
+
+=== End SRU Template ===
+
diff --git a/bugs/lp-1692093.txt b/bugs/lp-1692093.txt
 new file mode 100644
index 0000000..82391c1
--- /dev/null
+++ b/bugs/lp-1692093.txt
@@ -0,0 +1,78 @@
+http://pad.lv/1692093
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1692093
+
+
+=== Begin SRU Template ===
+[Impact]
+VMs on MS Azure have an ephemeral disk attached to them.
+On first boot, cloud-init properly notices the empty ntfs filesystem and
+reformats it ext4.
+
+After deallocating the instance or moving to a new azure host,
+the filesystem reformat is logged, but isn't actually performed because
+the udev device creation may not have settled.
+
+[Test Case]
+Test cases:
+ 1. Deploy an instance VM on Azure
+ 2. Log in and ensure that the ephemeral disk is formatted and mounted to /mnt
+ 3. Via the portal you can "Redeploy" the VM to a new Azure Host (or alternatively stop and deallocate the VM for some time, and then restart/reallocate the VM).
+
+Expected Results:a
+ - Check cloud-init.log expecting to see logs from cc_disk_setup about the mount.
+ - After reallocation we expect the ephemeral disk to be formatted and mounted to /mnt.
+
+Actual Results:
+ - After reallocation /mnt is not mounted and there are errors in the cloud-init log.
+
+[Regression Potential]
+
+[Other Info]
+Upstream commit at
+  https://git.launchpad.net/cloud-init/commit/?id=1815c6d801933c47a01f1a94a8e689824f6797b4
+
+=== End SRU Template ===
+
+Cloud Provider: Azure
+dpkg-query -W -f='${Version}' cloud-init output: 0.7.9-90-g61eb03fe-0ubuntu1~16.04.1
+
+When the following is specified in cloud init it seems to be re-executing fs and disk setup (even though run command does not seem to re run)
+disk_setup:
+  /dev/sdc:
+      table_type: gpt
+      layout: true
+      overwrite: false
+
+fs_setup:
+- label: etcd_disk
+  filesystem: ext4
+  device: /dev/sdc1
+  extra_opts:
+    - "-F"
+    - "-E"
+    - "lazy_itable_init=1,lazy_journal_init=1"
+
+mounts:
+- - /dev/sdc1
+  - /var/lib/etcddisk
+
+From cloud-init-output.log:
+
+Cloud-init v. 0.7.9 running 'modules:final' at Mon, 15 May 2017 18:33:15 +0000. Up 64.24 seconds.
+Cloud-init v. 0.7.9 finished at Mon, 15 May 2017 18:34:46 +0000. Datasource DataSourceAzureNet [seed=/dev/sr0].  Up 155.34 seconds
+Cloud-init v. 0.7.9 running 'init-local' at Tue, 16 May 2017 01:52:37 +0000. Up 10.33 seconds.
+Cloud-init v. 0.7.9 running 'init' at Tue, 16 May 2017 01:52:39 +0000. Up 12.06 seconds.
+
+From cloud-init.log for the initial provision:
+
[phone]:32:46,820 - cc_disk_setup.py[DEBUG]: Creating file system etcd_disk on /dev/sdc1
[phone]:32:46,820 - cc_disk_setup.py[DEBUG]:      Using cmd: /sbin/mkfs.ext4 /dev/sdc1 -L etcd_disk -F -E lazy_itable_init=1,lazy_journal_init=1
[phone]:32:46,820 - util.py[DEBUG]: Running command ['/sbin/mkfs.ext4', '/dev/sdc1', '-L', 'etcd_disk', '-F', '-E', 'lazy_itable_init=1,lazy_journal_init=1'] with allowed return codes [0] (shell=False, capture=True)
[phone]:33:04,054 - util.py[DEBUG]: Creating fs for /dev/sdc1 took 17.237 seconds
+
+and after reboot (cloud-init.log)
+
[phone]:52:40,245 - cc_disk_setup.py[DEBUG]: Creating file system etcd_disk on /dev/sdc1
[phone]:52:40,246 - cc_disk_setup.py[DEBUG]:      Using cmd: /sbin/mkfs.ext4 /dev/sdc1 -L etcd_disk -F -E lazy_itable_init=1,lazy_journal_init=1
[phone]:52:40,246 - util.py[DEBUG]: Running command ['/sbin/mkfs.ext4', '/dev/sdc1', '-L', 'etcd_disk', '-F', '-E', 'lazy_itable_init=1,lazy_journal_init=1'] with allowed return codes [0] (shell=False, capture=True)
+
diff --git a/bugs/lp-1692097.txt b/bugs/lp-1692097.txt
 new file mode 100644
index 0000000..012fa07
--- /dev/null
+++ b/bugs/lp-1692097.txt
@@ -0,0 +1,24 @@
+http://pad.lv/1692097
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1692097
+
+
+Evergreen circ 2.12
+
+The Grunt-driven minification and concatenation configuration is missing some parts and not doing all that it could to make JS file downloads more efficient.
+
+I have put together a patch to do the following:
+
+* Support minifying the core Evergreen services files (i.e. service/*.js).  Previously, they were only concatenated.
+
+* Create one concatenated file for external dependencies (jquery, angular, etc.) and a separate concatenated file for Evergreen core service files.
+
+Included in this is replacing the template variable EXPAND_WEB_IMPORTS with EXPAND_WEB_DEP_IMPORTS and EXPAND_WEB_CORE_IMPORTS.
+
+The thinking here is that concatenating 3rd party files (which are already minified) is an easy win and should not complicate debugging, whereas minifying and concatenating EG service files will require more testing.  It's also nice that you can expand one or the other as needed for debugging.
+
+The build creates evergreen-staff-client.0.0.1.deps.min.js and evergreen-staff-client.0.0.1.core.min.js
+
+* Various fixes to the Gruntfile, including missing dependency references and fixing some faulty assumptions from early iterations of the file.
+
+* Remove OpenSRF JS from the minify/concat processes.  Otherwise, we have to add some variable replacements in Gruntfile to avoid hard-coding the path to the OpenSRF js files.  Not sure it's worth it for 3 small-ish files.
+
diff --git a/bugs/lp-1693582.txt b/bugs/lp-1693582.txt
 new file mode 100644
index 0000000..6521a49
--- /dev/null
+++ b/bugs/lp-1693582.txt
@@ -0,0 +1,30 @@
+
+http://pad.lv/1693582
+https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1693582
+
+
+=== Begin SRU Template ===
+[Impact]
+This code path is only exercised on GCE datasources and in such cases get_data
+would have not configured GCE-configured authorized ssh keys for the default user.
+
+[Test Case]
+Launch an instance on GCE
+Update cloud-init deb
+run sudo cloud-init single -n cc_ntp
+curl -H "Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh-keys
+validate .ssh/authorized_keys contains keys listed in the above curl
+
+[Regression Potential]
+GCE instances with don't support instance/attributes/ssh-keys would only be able
+to configure ssh access via #cloud-config ssh declarations.
+
+
+[Other Info]
+Upstream commit:
+ https://git.launchpad.net/cloud-init/commit/?id=d27c49391df343d25bd2e24045d2be6bf39c30d2
+GCE metadata docs:
+ https://cloud.google.com/compute/docs/storing-retrieving-metadata
+
+=== End SRU Template ===
+