diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-04-13 22:22:40 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2018-04-19 04:16:11 +0000 |
| commit | d98ecbac0bfbe4157efea5a00836a541ac681b7c (patch) | |
| tree | 996bed129d46aa32ec1d0945849da760fdf95793 /apex/deploy.py | |
| parent | e5caea32820466d5870f11ba72255b8f77591a62 (diff) | |
Fix nosdn fdio scenario
- Update networking-vpp to use master branch
- Update THT vpp ml2 environment file with correct parameters
- Update external network creation command to use 'externa' as
provider network name.
- Remove vpp network settings file as it's not used
apex-tripleo-heat-templates: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a
apex-puppet-tripleo: I231054a433eb7e598a6e24f6eaea02d476e776de
Change-Id: I4a1f68c75ae3b7d2a5b347d05abf0d025e8b116b
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 5acf4e708c68147ef20c67f8d4648e6027c1e20d)
Diffstat (limited to 'apex/deploy.py')
| -rw-r--r-- | apex/deploy.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/deploy.py b/apex/deploy.py index 4facadef..bc4d0789 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -515,7 +515,7 @@ def main(): 'UserKnownHostsFile=/dev/null -o ' \ 'LogLevel=error' deploy_vars['external_network_cmds'] = \ - oc_deploy.external_network_cmds(net_settings) + oc_deploy.external_network_cmds(net_settings, deploy_settings) # TODO(trozet): just parse all ds_opts as deploy vars one time deploy_vars['gluon'] = ds_opts['gluon'] deploy_vars['sdn'] = ds_opts['sdn_controller'] |