[RFR] Add timeout handling to appliance config and clone_template script

cfme/utils/appliance/__init__.py

@@ -464,8 +464,9 @@ def configure(self, log_callback=None, **kwargs):
         on_gce = kwargs.pop('on_gce', False)
         on_openstack = kwargs.pop('on_openstack', False)
         rails_deprecations = kwargs.pop('rails_deprecations', ':log')
+        ssh_timeout = kwargs.pop('timeout', 600)
         with self as ipapp:
-            ipapp.wait_for_ssh()
+            ipapp.wait_for_ssh(timeout=ssh_timeout)
 
             # Debugging - ifcfg-eth0 overwritten by unknown process
             # Rules are permanent and will be reloade after machine reboot

scripts/clone_template.py

@@ -345,7 +345,7 @@ def main(**kwargs):
                 # openshift appliances don't need any additional configuration
                 pass
             else:
-                app.configure()
+                app.configure(timeout=600)
             logger.info('Successfully Configured the appliance.')
     except Exception as e:
         logger.exception(e)