diff options
author | Tim Rozet <trozet@redhat.com> | 2017-09-29 23:17:53 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 23:17:53 +0000 |
commit | c104a284855069882e2625c57b5c2c78b0c6ba4d (patch) | |
tree | a11156ea94ff9dfddcc278c973771d66c452c332 /apex/deploy.py | |
parent | 5729ad141664925d922ea6cbea7cdcde09d9b18c (diff) | |
parent | b6896a9bbfd7d4825f6b68b594441a3e0be7b85f (diff) |
Merge "re-enable support for fdio dvr scenario" into stable/euphrates
Diffstat (limited to 'apex/deploy.py')
-rw-r--r-- | apex/deploy.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index 55b1092a..8a3d13ed 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -58,6 +58,14 @@ def validate_cross_settings(deploy_settings, net_settings, inventory): raise ApexDeployException("Setting a DPDK based dataplane requires" "a dedicated NIC for tenant network") + if 'odl_vpp_routing_node' in deploy_settings['deploy_options']: + if deploy_settings['deploy_options']['dataplane'] != 'fdio': + raise ApexDeployException("odl_vpp_routing_node should only be set" + "when dataplane is set to fdio") + if deploy_settings['deploy_options'].get('dvr') is True: + raise ApexDeployException("odl_vpp_routing_node should only be set" + "when dvr is not enabled") + # TODO(trozet): add more checks here like RAM for ODL, etc # check if odl_vpp_netvirt is true and vpp is set # Check if fdio and nosdn: @@ -336,8 +344,8 @@ def main(): overcloud_deploy.prep_image(deploy_settings, sdn_image, APEX_TEMP_DIR, root_pw=root_pw) opnfv_env = os.path.join(args.deploy_dir, args.env_file) - overcloud_deploy.prep_env(deploy_settings, net_settings, opnfv_env, - net_env_target, APEX_TEMP_DIR) + overcloud_deploy.prep_env(deploy_settings, net_settings, inventory, + opnfv_env, net_env_target, APEX_TEMP_DIR) overcloud_deploy.create_deploy_cmd(deploy_settings, net_settings, inventory, APEX_TEMP_DIR, args.virtual, args.env_file) |