summaryrefslogtreecommitdiffstats
path: root/apex/deploy.py
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-04-13 22:22:40 -0400
committerFeng Pan <fpan@redhat.com>2018-04-17 17:05:15 -0400
commit5acf4e708c68147ef20c67f8d4648e6027c1e20d (patch)
tree745208381759324e27f1dce969c9d668a67054b7 /apex/deploy.py
parent1abb8ac25c48d182bc267d23f618043fbd7e0843 (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>
Diffstat (limited to 'apex/deploy.py')
-rw-r--r--apex/deploy.py2
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']