diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-09-11 15:58:49 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-09-28 19:56:09 -0400 |
| commit | a3c2c8c746470c993d70d92d13415e2b4263cc25 (patch) | |
| tree | 503f3a4deed376768693bac148a36a145c55cbfe /apex/deploy.py | |
| parent | 7af8cf039ef21da528a8cb53e0eb78c1b6878714 (diff) | |
re-enable support for fdio dvr scenario
- Update FDIO scenarios to use master branch images
- Update VPP/HC version to master for all fdio scenarios
apex-os-net-config: Ie6aee86eaccad5fc98820a28f10adc7475cc5e33
apex-tripleo-heat-templates: Ie8b284f64bd6491c389129d8afdaeae8a399b607
apex-puppet-tripleo: I9954240529278e74d93fdf89d2ebc2536249245a
Change-Id: I31740f97052947b5e4688cca47320bc49a902d7c
Signed-off-by: Feng Pan <fpan@redhat.com>
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 a0561384..89b0e9f5 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) |