Import patches-applied version 2.2.2-0ubuntu1 to applied/ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: a05019d9343d0fde153d75a8e61fb6f99d1d3ff3
Unapplied parent: 558111e33720eb8f1eaacf571cf4fadae2430286

New changelog entries:
  * New upstream release (LP: #1651128)
    - d/patches/fix-auto-update.patch,
      d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
      - Dropped as changes have been applied upstream
    - Refreshed debian/patches/disable_import_test.patch

1 files changed, 7 insertions, 7 deletions

diff --git a/azurelinuxagent/pa/provision/ubuntu.py b/azurelinuxagent/pa/provision/ubuntu.py
index c334f23..7f2bce3 100644
--- a/azurelinuxagent/pa/provision/ubuntu.py
+++ b/azurelinuxagent/pa/provision/ubuntu.py
@@ -32,12 +32,14 @@ from azurelinuxagent.pa.provision.default import ProvisionHandler
 """
 On ubuntu image, provision could be disabled.
 """
+
+
 class UbuntuProvisionHandler(ProvisionHandler):
     def __init__(self):
         super(UbuntuProvisionHandler, self).__init__()
 
     def run(self):
-        #If provision is enabled, run default provision handler
+        # If provision is enabled, run default provision handler
         if conf.get_provision_enabled():
             super(UbuntuProvisionHandler, self).run()
             return
@@ -49,23 +51,21 @@ class UbuntuProvisionHandler(ProvisionHandler):
 
         logger.info("Waiting cloud-init to copy ovf-env.xml.")
         self.wait_for_ovfenv()
-
-        protocol = self.protocol_util.get_protocol()
+        self.protocol_util.get_protocol()
         self.report_not_ready("Provisioning", "Starting")
-        logger.info("Sleep 15 seconds to prevent throttling")
-        time.sleep(15) #Sleep to prevent throttling
+        logger.info("Sleeping 1 second to avoid throttling.")
+        time.sleep(1)
         try:
             logger.info("Wait for ssh host key to be generated.")
             thumbprint = self.wait_for_ssh_host_key()
             fileutil.write_file(provisioned, "")
             logger.info("Finished provisioning")
-           
         except ProvisionError as e:
             logger.error("Provision failed: {0}", e)
             self.report_not_ready("ProvisioningFailed", ustr(e))
             self.report_event(ustr(e))
             return
-            
+
         self.report_ready(thumbprint)
         self.report_event("Provision succeed", is_success=True)