Import patches-unapplied version 2.1.2-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 04946cba49f19c0b6b876bccdbb36d47334af002

New changelog entries:
  * New upstream release (LP: #1523715):
    - Bug fixes for Ubuntu 15.10 on Azure
    - Enablement for Azure Stack
    - Dropped patch for systemd job as upstream now includes it.

4 files changed, 36 insertions, 25 deletions

diff --git a/debian/patches/disable-provisioning.patch b/debian/patches/disable-provisioning.patch
deleted file mode 100644
index 716ae12..0000000
--- a/debian/patches/disable-provisioning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config/ubuntu/waagent.conf
-+++ b/config/ubuntu/waagent.conf
-@@ -42,7 +42,7 @@
- ResourceDisk.Filesystem=ext4
- 
- # Mount point for the resource disk
--ResourceDisk.MountPoint=/mnt/resource
-+ResourceDisk.MountPoint=/mnt
- 
- # Create and use swapfile on resource disk.
- ResourceDisk.EnableSwap=n
diff --git a/debian/patches/disable_import_test.patch b/debian/patches/disable_import_test.patch
index 21b15e0..f7e6b64 100644
--- a/debian/patches/disable_import_test.patch
+++ b/debian/patches/disable_import_test.patch
@@ -15,3 +15,39 @@
  
  if __name__ == '__main__':
      unittest.main()
+--- a/config/waagent.conf
++++ b/config/waagent.conf
+@@ -14,13 +14,13 @@
+ Role.TopologyConsumer=None
+ 
+ # Enable instance creation
+-Provisioning.Enabled=y
++Provisioning.Enabled=n
+ 
+ # Password authentication for root account will be unavailable.
+-Provisioning.DeleteRootPassword=y
++Provisioning.DeleteRootPassword=n
+ 
+ # Generate fresh host key pair.
+-Provisioning.RegenerateSshHostKeyPair=y
++Provisioning.RegenerateSshHostKeyPair=n
+ 
+ # Supported values are "rsa", "dsa" and "ecdsa".
+ Provisioning.SshHostKeyPairType=rsa
+@@ -41,14 +41,14 @@
+ #Provisioning.PasswordCryptSaltLength=10
+ 
+ # Format if unformatted. If 'n', resource disk will not be mounted.
+-ResourceDisk.Format=y
++ResourceDisk.Format=n
+ 
+ # File system on the resource disk
+ # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
+ ResourceDisk.Filesystem=ext4
+ 
+ # Mount point for the resource disk
+-ResourceDisk.MountPoint=/mnt/resource
++ResourceDisk.MountPoint=/mnt
+ 
+ # Create and use swapfile on resource disk.
+ ResourceDisk.EnableSwap=n
diff --git a/debian/patches/series b/debian/patches/series
index 70a6cde..d32f0ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 cloud-init-default-cfg.patch
-start-after-cloudinit.patch
 disable-udev-rules-removal.patch
-disable-provisioning.patch
 disable_rhel_tests.patch
 disable_import_test.patch
diff --git a/debian/patches/start-after-cloudinit.patch b/debian/patches/start-after-cloudinit.patch
deleted file mode 100644
index 235b70e..0000000
--- a/debian/patches/start-after-cloudinit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/init/ubuntu/walinuxagent.service
-+++ b/init/ubuntu/walinuxagent.service
-@@ -1,7 +1,7 @@
- [Unit]
- Description=Azure Linux Agent
--After=network.target
--After=sshd.service
-+After=network-online.target cloud-final.service
-+Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service
- ConditionFileIsExecutable=/usr/sbin/waagent
- ConditionPathExists=/etc/waagent.conf
-