summaryrefslogtreecommitdiffstats
path: root/doctor_tests/installer/common/restore_compute_config.py
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2018-10-25 13:36:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-25 13:36:16 +0000
commitbaac6579556f8216b36db0d0f87f9c2d4f8b4ef5 (patch)
tree71d467ffd009f469671d77927f34b15098ecd431 /doctor_tests/installer/common/restore_compute_config.py
parent23bf63c4616040cb0d69cd26238af2a4a7c00a90 (diff)
parenta6575910a137f8932e294f66c9da3194ad937691 (diff)
Merge "Support Apex with services in containers"
Diffstat (limited to 'doctor_tests/installer/common/restore_compute_config.py')
-rw-r--r--doctor_tests/installer/common/restore_compute_config.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/doctor_tests/installer/common/restore_compute_config.py b/doctor_tests/installer/common/restore_compute_config.py
index 0971d12b..0e9939fd 100644
--- a/doctor_tests/installer/common/restore_compute_config.py
+++ b/doctor_tests/installer/common/restore_compute_config.py
@@ -11,8 +11,11 @@ import shutil
def restore_cpu_allocation_ratio():
- nova_file = '/etc/nova/nova.conf'
- nova_file_bak = '/etc/nova/nova.bak'
+ nova_base = "/var/lib/config-data/puppet-generated/nova"
+ if not os.path.isdir(nova_base):
+ nova_base = ""
+ nova_file = nova_base + '/etc/nova/nova.conf'
+ nova_file_bak = nova_base + '/etc/nova/nova.bak'
if not os.path.isfile(nova_file_bak):
print('Bak_file:%s does not exist.' % nova_file_bak)