diff options
author | Feng Pan <fpan@redhat.com> | 2018-06-28 23:48:05 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2018-07-18 19:57:46 +0000 |
commit | 8bc7bd15dcb170f3c37dfe0358dcdf7f9189b2ba (patch) | |
tree | 6f222c0c0e433ea6ed9b436ff348d08d84426f76 /apex/deploy.py | |
parent | a473a19aca3837eeb77adc41523bb1db95b5f47d (diff) |
Add tenant vlan support
Introduces tenant vlan support through configuration of network settings file.
JIRA: APEX-272
Change-Id: Ie8e20a92ca4ebb9e0de4c53b5e03856d19ff660c
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'apex/deploy.py')
-rw-r--r-- | apex/deploy.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index 1e477ee0..9bf9b12e 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -416,15 +416,8 @@ def main(): # opnfv env file will not work with upstream args.env_file = 'upstream-environment.yaml' opnfv_env = os.path.join(args.deploy_dir, args.env_file) - - # TODO(trozet): Invoke with containers after Fraser migration - # oc_deploy.prep_env(deploy_settings, net_settings, inventory, - # opnfv_env, net_env_target, APEX_TEMP_DIR) - - shutil.copyfile( - opnfv_env, - os.path.join(APEX_TEMP_DIR, os.path.basename(opnfv_env)) - ) + oc_deploy.prep_env(deploy_settings, net_settings, inventory, + opnfv_env, net_env_target, APEX_TEMP_DIR) patched_containers = oc_deploy.prep_image( deploy_settings, net_settings, sdn_image, APEX_TEMP_DIR, root_pw=root_pw, docker_tag=tag, patches=patches['overcloud']) |