Merge "Configure nova aggregate only in case of hybrid setups with so…

…me computes using docker and some using libvirt hypervisor."

fabfile/tasks/provision.py

@@ -879,6 +879,15 @@ def setup_nova_aggregate():
 
 @task
 def setup_nova_aggregate_node(*args):
+    docker = any(['docker' == get_hypervisor(compute_host)
+                  for compute_host in env.roledefs['compute']])
+    libvirt = any(['libvirt' == get_hypervisor(compute_host)
+                  for compute_host in env.roledefs['compute']])
+    if not (libvirt and docker):
+        # Not a hybrid setup(libvirt + docker)
+        # No need for the compute aggregate
+        return
+
     for compute_host in env.roledefs['compute']:
         hypervisor = get_hypervisor(compute_host)
         host_name = None

fabfile/tasks/tester.py

@@ -345,6 +345,8 @@ def get_test_features(feature=None):
     with settings(hide('everything'), host_string=cfgm_host):
         remote_test_dir = get_remote_path(env.test_repo_dir)
         if not exists(remote_test_dir):
+            print "Setting up test enviroinment in the first cfgm..."
+            print "Will take maximum of 2 minutes"
             execute(setup_test_env)
         with cd('%s/tools/' % remote_test_dir):
             features = sudo(cmd)
@@ -363,6 +365,8 @@ def run_sanity(feature='sanity', test=None):
 
     if os.environ.has_key('GUESTVM_IMAGE'):
         env_vars = env_vars + ' ci_image=%s' %(os.environ['GUESTVM_IMAGE'])
+    elif env.has_key('guestvm_image'):
+        env_vars = env_vars + ' ci_image=%s' % env.get('guestvm_image')
 
     if feature in ('upgrade','upgrade_only'):
         with settings(host_string = env.roledefs['cfgm'][0]):