instack fails to create ctlplane network

[Dan Prince]

Using the latest upstream version of instack I'm now hitting an issue where neutron fails to create the ctlplane network. I'm getting the following error:

Flat networks are disabled

which seems to be related to neutron commit cb712c5a9ee2717f5d34b00a420529b842db90c7

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/244197

[Dan Prince (dan-prince)]

https://review.openstack.org/244197

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/244197
Committed: https://git.openstack.org/cgit/openstack/instack-undercloud/commit/?id=f9ed51c5da8d0d82a9c83e82df862f3bdd083cba
Submitter: Jenkins
Branch: master

commit f9ed51c5da8d0d82a9c83e82df862f3bdd083cba
Author: Dan Prince <email address hidden>
Date: Wed Nov 11 11:26:58 2015 -0500

    Use flat_networks=* default for the ml2 plugin

    We are setting our flat_networks setting for the ml2 plugin
    manually to '' which as of neutron git commit
    cb712c5a9ee2717f5d34b00a420529b842db90c7 causes a
    'Flat networks are disabled' error to occur when
    we attempt to create the ctlplane network.

    This patch drops the configurion of flat_networks from
    instack and instead relies on the puppet-neutron default
    of '*' which will work.

    Change-Id: I880c9a159a46d9a288cb1f8bf79af30e5045d5ab
    Closes-bug: #1515315

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/248199

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/248199
Committed: https://git.openstack.org/cgit/openstack/instack-undercloud/commit/?id=09dce0dd18fa09d1fd0c8bde8f961b6adf7a613c
Submitter: Jenkins
Branch: stable/liberty

commit 09dce0dd18fa09d1fd0c8bde8f961b6adf7a613c
Author: Dan Prince <email address hidden>
Date: Wed Nov 11 11:26:58 2015 -0500

    Use flat_networks=* default for the ml2 plugin

    We are setting our flat_networks setting for the ml2 plugin
    manually to '' which as of neutron git commit
    cb712c5a9ee2717f5d34b00a420529b842db90c7 causes a
    'Flat networks are disabled' error to occur when
    we attempt to create the ctlplane network.

    This patch drops the configurion of flat_networks from
    instack and instead relies on the puppet-neutron default
    of '*' which will work.

    Change-Id: I880c9a159a46d9a288cb1f8bf79af30e5045d5ab
    Closes-bug: #1515315
    (cherry picked from commit f9ed51c5da8d0d82a9c83e82df862f3bdd083cba)