diff options
author | Tim Rozet <trozet@redhat.com> | 2018-11-01 15:09:00 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2018-11-01 15:09:00 -0400 |
commit | be1a60fcde0c122266e8c074df729a1be75f5607 (patch) | |
tree | 9ce5c2838a95a93a0b6c0e9171cc32f7cbfbefb9 /apex/builders/common_builder.py | |
parent | 03ad54f56a111dc15a834ae28cbef03da0ad68af (diff) |
Fix neutron_driver for odl
The neutron_driver for opendaylight needs to be set to 'odl' instead of
'opendaylight'
Change-Id: Ib9345d8b9fc8be5b7a49ac961a2499220c1c1bd6
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/builders/common_builder.py')
-rw-r--r-- | apex/builders/common_builder.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py index e0e7303e..2934a1d8 100644 --- a/apex/builders/common_builder.py +++ b/apex/builders/common_builder.py @@ -265,14 +265,15 @@ def create_git_archive(repo_url, repo_name, tmp_dir, def get_neutron_driver(ds_opts): sdn = ds_opts.get('sdn_controller', None) - for controllers in 'opendaylight', 'ovn': - if sdn == controllers: - return sdn - if ds_opts.get('vpp', False): + if sdn == 'opendaylight': + return 'odl' + elif sdn == 'ovn': + return sdn + elif ds_opts.get('vpp', False): return 'vpp' - - return None + else: + return None def prepare_container_images(prep_file, branch='master', neutron_driver=None): |