Bug - Testing in Apex with OpenStack master fails

[doctor.git] / doctor_tests / installer / common / set_compute_config.py

diff --git a/doctor_tests/installer/common/set_compute_config.py b/doctor_tests/installer/common/set_compute_config.py
index 8626608..76ac649 100644 (file)
--- a/doctor_tests/installer/common/set_compute_config.py
+++ b/doctor_tests/installer/common/set_compute_config.py
@@ -10,29 +10,17 @@ import os
 import shutil
 
 
-def make_initial_config(service, dest):
-    for mk in ["", "/etc", "/%s" % service]:
-        dest += mk
-        os.mkdir(dest)
-    src = "/etc/%s/%s.conf" % (service, service)
-    dest += "/%s.conf" % service
-    shutil.copyfile(src, dest)
-
-
 def set_cpu_allocation_ratio():
-    docker_conf_base_dir = "/var/lib/config-data/puppet-generated"
-    if not os.path.isdir(docker_conf_base_dir):
-        nova_base = ""
-    else:
-        nova_base = "%s/nova" % docker_conf_base_dir
-        if not os.path.isdir(nova_base):
-            # nova.conf to be used might not exist
-            make_initial_config("nova", nova_base)
-    nova_file = nova_base + '/etc/nova/nova.conf'
-    nova_file_bak = nova_base + '/etc/nova/nova.bak'
+    nova_file_bak = None
+    for nova_file in ["/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf",  # noqa
+                      "/var/lib/config-data/puppet-generated/nova/etc/nova/nova.conf",  # noqa
+                      "/etc/nova/nova.conf"]:
+        if os.path.isfile(nova_file):
+            nova_file_bak = nova_file.replace(".conf", ".bak")
+            break
 
-    if not os.path.isfile(nova_file):
-        raise Exception("File doesn't exist: %s." % nova_file)
+    if nova_file_bak is None:
+        raise Exception("Could not find nova.conf")
     # TODO (tojuvone): Unfortunately ConfigParser did not produce working conf
     fcheck = open(nova_file)
     found_list = ([ca for ca in fcheck.readlines() if "cpu_allocation_ratio"