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

Imported using git-ubuntu import.

Changelog parent: f6e3f158c2fb9021b37654ea20839ec7a4308d52
Unapplied parent: f4e6aca60e419eafbdf11bdd631d35cf785735ae

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.

1 files changed, 36 insertions, 0 deletions

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