diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-09-01 14:25:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-01 14:25:50 +0000 |
| commit | 13377044e0cafd1e27ff66da2b264d8fa19e09af (patch) | |
| tree | 3298ed68d599201f8f1ca892bdbd31a374381026 /apex | |
| parent | c81b847004aeed37931ee2e8ba53ebc193598fd0 (diff) | |
| parent | 7c61b83d4a8c41eac0d80e7783cdf1702f91f9e6 (diff) | |
Merge "Adds Undercloud retry and log fetch"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/undercloud/undercloud.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index a1af4d00..da695f5b 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -11,6 +11,7 @@ import libvirt import logging import os import shutil +import subprocess import time from apex.virtual import virtual_utils as virt_utils @@ -107,14 +108,25 @@ class Undercloud: def configure(self, net_settings, playbook, apex_temp_dir): """ Configures undercloud VM - :return: + :param net_setings: Network settings for deployment + :param playbook: playbook to use to configure undercloud + :param apex_temp_dir: temporary apex directory to hold configs/logs + :return: None """ - # TODO(trozet): If undercloud install fails we can add a retry + logging.info("Configuring Undercloud...") # run ansible ansible_vars = Undercloud.generate_config(net_settings) ansible_vars['apex_temp_dir'] = apex_temp_dir - utils.run_ansible(ansible_vars, playbook, host=self.ip, user='stack') + try: + utils.run_ansible(ansible_vars, playbook, host=self.ip, + user='stack') + except subprocess.CalledProcessError: + logging.error( + "Failed to install undercloud..." + "please check log: {}".format(os.path.join( + apex_temp_dir, 'apex-undercloud-install.log'))) + raise ApexUndercloudException('Failed to install undercloud') logging.info("Undercloud installed!") def setup_volumes(self): |