From: Tim Rozet <trozet@redhat.com>
Date: Tue, 15 May 2018 20:38:44 +0000 (-0400)
Subject: Fixes ctlplane default route
X-Git-Tag: opnfv-6.1.0~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c5bafa166da6681c96a3c0d0e4b869621d52efd4;p=apex.git

Fixes ctlplane default route

Default route was using the undercloud IP, and instead should be using
the gateway set for the network in network settings.

JIRA: APEX-597

Change-Id: Iff6b18a6553af98cf9da72c278f358922d489958
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/apex/network/network_environment.py b/apex/network/network_environment.py
index ea71e0f3..0a4d1036 100644
--- a/apex/network/network_environment.py
+++ b/apex/network/network_environment.py
@@ -82,7 +82,7 @@ class NetworkEnvironment(dict):
         admin_prefix = str(admin_cidr.prefixlen)
         self[param_def]['ControlPlaneSubnetCidr'] = admin_prefix
         self[param_def]['ControlPlaneDefaultRoute'] = \
-            nets[ADMIN_NETWORK]['installer_vm']['ip']
+            nets[ADMIN_NETWORK]['gateway']
         self[param_def]['EC2MetadataIp'] = \
             nets[ADMIN_NETWORK]['installer_vm']['ip']
         self[param_def]['DnsServers'] = net_settings['dns_servers']