Default ctlplane to native VLAN 27/58127/1
authorTim Rozet <trozet@redhat.com>
Wed, 23 May 2018 20:09:47 +0000 (16:09 -0400)
committerTim Rozet <trozet@redhat.com>
Thu, 31 May 2018 18:13:51 +0000 (18:13 +0000)
commit073cf28764cd3700916f57e43741ff20e4af57e5
tree54445a3211944efeaaaf71678223f3cd7e1891df
parentfd7f3285fa0d872f3eb23ded248e45bf720ebda7
Default ctlplane to native VLAN

We were not setting any vlan type value for the admin network.  This
caused an issue when deploying and trying to use a single collapsed
network (no net isolation).  The issue occurred when trying to create an
external neutron network.  We happen to check if the phys type is flat
or vlan using this attribute to decide what kind of phys type to use for
the neutron network.

JIRA: APEX-606

Change-Id: I4e24dd5e8b99cef920b8203b820a77d0021631cc
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 42a9303a21a46f9e9b1997ab4c0beceb6b0bf438)
apex/settings/network_settings.py
apex/tests/test_apex_network_settings.py