diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-11-01 16:22:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-01 16:22:19 +0000 |
| commit | 03ad54f56a111dc15a834ae28cbef03da0ad68af (patch) | |
| tree | 86194e90010ee0e57583e992e70480031126c1b8 /apex/deploy.py | |
| parent | 63792906e8681bef2f0e03ee12ea422af53d9c12 (diff) | |
| parent | d38e8a91c1a0e3f94d2a19876956ade48d1a8ed2 (diff) | |
Merge "Fixes Docker image upload for master/rocky"
Diffstat (limited to 'apex/deploy.py')
| -rw-r--r-- | apex/deploy.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index dab6bd1e..f1ab260f 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -415,6 +415,15 @@ def main(): for role in 'compute', 'controller': oc_cfg.create_nic_template(net_settings, deploy_settings, role, args.deploy_dir, APEX_TEMP_DIR) + # Prepare/Upload docker images + docker_env = 'containers-prepare-parameter.yaml' + shutil.copyfile(os.path.join(args.deploy_dir, docker_env), + os.path.join(APEX_TEMP_DIR, docker_env)) + c_builder.prepare_container_images( + os.path.join(APEX_TEMP_DIR, docker_env), + branch=branch, + neutron_driver=c_builder.get_neutron_driver(ds_opts) + ) # Install Undercloud undercloud.configure(net_settings, deploy_settings, os.path.join(args.lib_dir, constants.ANSIBLE_PATH, |