summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-09-21 08:33:33 -0400
committerDan Radez <dradez@redhat.com>2017-09-21 08:43:51 -0400
commitfae35267b18d246350ace0e38c41c307bec73894 (patch)
treeaed4c80a61e406e9c3c95917c6a350bb9aa69a8c
parentd76b7e53517116a4b5cbe10dbf69a1a82e9b9a41 (diff)
Removing duplicate lib path in ansible_path
- deploy line 283 lib is joined with ANSIBLE_PATH then line 285, 347, 418 and 435 it was joined again with ansible_path from 283 already containing lib Change-Id: I6612967d626eeb0668eb43294831447c387f8e93 Signed-off-by: Dan Radez <dradez@redhat.com>
-rw-r--r--apex/deploy.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/apex/deploy.py b/apex/deploy.py
index 9ebc3f62..22faec92 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -280,10 +280,8 @@ def main():
ansible_args = {
'virsh_enabled_networks': net_settings.enabled_network_list
}
- ansible_path = os.path.join(args.lib_dir, ANSIBLE_PATH)
utils.run_ansible(ansible_args,
- os.path.join(args.lib_dir,
- ansible_path,
+ os.path.join(args.lib_dir, ANSIBLE_PATH,
'deploy_dependencies.yml'))
uc_external = False
if 'external' in net_settings.enabled_network_list:
@@ -328,8 +326,7 @@ def main():
args.deploy_dir, APEX_TEMP_DIR)
# Install Undercloud
undercloud.configure(net_settings,
- os.path.join(args.lib_dir,
- ansible_path,
+ os.path.join(args.lib_dir, ANSIBLE_PATH,
'configure_undercloud.yml'),
APEX_TEMP_DIR)
@@ -344,7 +341,7 @@ def main():
overcloud_deploy.create_deploy_cmd(deploy_settings, net_settings,
inventory, APEX_TEMP_DIR,
args.virtual, args.env_file)
- deploy_playbook = os.path.join(args.lib_dir, ansible_path,
+ deploy_playbook = os.path.join(args.lib_dir, ANSIBLE_PATH,
'deploy_overcloud.yml')
virt_env = 'virtual-environment.yaml'
bm_env = 'baremetal-environment.yaml'
@@ -415,7 +412,7 @@ def main():
deploy_vars['external_network_ipv6'] = True
else:
deploy_vars['external_network_ipv6'] = False
- post_undercloud = os.path.join(args.lib_dir, ansible_path,
+ post_undercloud = os.path.join(args.lib_dir, ANSIBLE_PATH,
'post_deploy_undercloud.yml')
logging.info("Executing post deploy configuration undercloud playbook")
try:
@@ -432,7 +429,7 @@ def main():
deploy_vars['vpn'] = ds_opts['vpn']
# 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, ANSIBLE_PATH,
'post_deploy_overcloud.yml')
# Run per overcloud node
for node, ip in deploy_vars['overcloud_nodes'].items():