Adds the ability to fetch logs from deployment

[apex.git] / apex / deploy.py

diff --git a/apex/deploy.py b/apex/deploy.py
index 7bc5568..4facade 100644 (file)
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -39,7 +39,6 @@ from apex.overcloud import config as oc_cfg
 from apex.overcloud import deploy as oc_deploy
 
 APEX_TEMP_DIR = tempfile.mkdtemp(prefix='apex_tmp')
-ANSIBLE_PATH = 'ansible/playbooks'
 SDN_IMAGE = 'overcloud-full-opendaylight.qcow2'
 
 
@@ -309,7 +308,7 @@ def main():
             'virsh_enabled_networks': net_settings.enabled_network_list
         }
         utils.run_ansible(ansible_args,
-                          os.path.join(args.lib_dir, ANSIBLE_PATH,
+                          os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
                                        'deploy_dependencies.yml'))
         uc_external = False
         if 'external' in net_settings.enabled_network_list:
@@ -397,7 +396,7 @@ def main():
                                        args.deploy_dir, APEX_TEMP_DIR)
         # Install Undercloud
         undercloud.configure(net_settings, deploy_settings,
-                             os.path.join(args.lib_dir, ANSIBLE_PATH,
+                             os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
                                           'configure_undercloud.yml'),
                              APEX_TEMP_DIR, virtual_oc=args.virtual)
 
@@ -433,7 +432,7 @@ def main():
                                     os.path.basename(opnfv_env),
                                     net_data=net_data)
         # Prepare undercloud with containers
-        docker_playbook = os.path.join(args.lib_dir, ANSIBLE_PATH,
+        docker_playbook = os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
                                        'prepare_overcloud_containers.yml')
         if ds_opts['containers']:
             ceph_version = constants.CEPH_VERSION_MAP[ds_opts['os_version']]
@@ -466,7 +465,7 @@ def main():
                 os.remove(os.path.join(APEX_TEMP_DIR, 'overcloud-full.qcow2'))
                 raise
 
-        deploy_playbook = os.path.join(args.lib_dir, ANSIBLE_PATH,
+        deploy_playbook = os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
                                        'deploy_overcloud.yml')
         virt_env = 'virtual-environment.yaml'
         bm_env = 'baremetal-environment.yaml'
@@ -542,7 +541,7 @@ def main():
         else:
             deploy_vars['overcloudrc_files'] = ['overcloudrc']
 
-        post_undercloud = os.path.join(args.lib_dir, ANSIBLE_PATH,
+        post_undercloud = os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
                                        'post_deploy_undercloud.yml')
         logging.info("Executing post deploy configuration undercloud playbook")
         try:
@@ -561,7 +560,7 @@ def main():
         deploy_vars['sriov'] = ds_opts.get('sriov')
         # TODO(trozet): pull all logs and store in tmp dir in overcloud
         # playbook
-        post_overcloud = os.path.join(args.lib_dir, ANSIBLE_PATH,
+        post_overcloud = os.path.join(args.lib_dir, constants.ANSIBLE_PATH,
                                       'post_deploy_overcloud.yml')
         # Run per overcloud node
         for node, ip in deploy_vars['overcloud_nodes'].items():