diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-12-05 16:33:13 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2018-02-16 12:29:56 -0500 |
| commit | 5443898e7a1927d8e3cd35e70e3872ed5d9a6d97 (patch) | |
| tree | 6c1bd62f6e44738ac13c40c69d9ddfbbf957192d /apex/deploy.py | |
| parent | d75cbb74191e32e3ff996604e30a2954d889687b (diff) | |
Add http(s)_proxy handling to apex
JIRA: APEX-512
Change-Id: I875bd99203b425e448e7a3f64eb9a8f99d03ddaf
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'apex/deploy.py')
| -rw-r--r-- | apex/deploy.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index 5171c5cd..fe25634f 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -411,8 +411,8 @@ def main(): if not upstream: oc_deploy.prep_env(deploy_settings, net_settings, inventory, opnfv_env, net_env_target, APEX_TEMP_DIR) - oc_deploy.prep_image(deploy_settings, sdn_image, APEX_TEMP_DIR, - root_pw=root_pw) + oc_deploy.prep_image(deploy_settings, net_settings, sdn_image, + APEX_TEMP_DIR, root_pw=root_pw) else: shutil.copyfile(sdn_image, os.path.join(APEX_TEMP_DIR, 'overcloud-full.qcow2')) @@ -449,6 +449,8 @@ def main(): deploy_vars['overcloudrc'] = 'source /home/stack/overcloudrc' deploy_vars['upstream'] = upstream deploy_vars['os_version'] = os_version + deploy_vars['http_proxy'] = net_settings.get('http_proxy', '') + deploy_vars['https_proxy'] = net_settings.get('https_proxy', '') for dns_server in net_settings['dns_servers']: deploy_vars['dns_server_args'] += " --dns-nameserver {}".format( dns_server) |