summaryrefslogtreecommitdiffstats
path: root/apex/deploy.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-20 00:24:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-20 00:24:47 +0000
commit82a9bec67b094f6381acb035a9efeffe47b011ab (patch)
treeeb300e2d526b919f2eb0953e3a4a61cf285d4496 /apex/deploy.py
parent48d1c6885afe72c92d07204cdfc97829ce9d24ed (diff)
parent8bc7bd15dcb170f3c37dfe0358dcdf7f9189b2ba (diff)
Merge "Add tenant vlan support"
Diffstat (limited to 'apex/deploy.py')
-rw-r--r--apex/deploy.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/apex/deploy.py b/apex/deploy.py
index 1e477ee..9bf9b12 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'])