tripleo-heat-templates: Including the nework-isolation.yaml file after network-management.yaml disables the Management network.

[Dan Sneddon]

Description of problem:
If both network-management.yaml and newtork-isolation.yaml are included in the deployment command-line, and the network-isolation.yaml file is included later, then it overrides the management network, causing the Control Plane IP to appear where the Management IP should.

Version-Release number of selected component (if applicable):
OSP-Director 8.0

How reproducible:
100%

Steps to Reproduce:
1. openstack overcloud deploy --templates -e /path/to/network-management.yaml -e /path/to/network-isolation.yaml

Actual results:
The first file enables the Management network, and the second disables it.

Expected results:
The management network should be enabled.

Additional info:
Since the Management nework is disabled by default, there is no reason to include it in the network-isolation.yaml file.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/333048
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=bf41f8f358fc2ae7dde1f7be94aa9027a27db09d
Submitter: Jenkins
Branch: master

commit bf41f8f358fc2ae7dde1f7be94aa9027a27db09d
Author: Dan Sneddon <email address hidden>
Date: Wed Jun 22 14:50:23 2016 -0700

    Fix network-isolation.yaml to stop clobbering Management net

    The network-isolation.yaml file explicitly set the Management
    network to None and the ports to noop.yaml. This resulted in the
    Management network being disabled if network-management.yaml was
    included before network-isolation.yaml.

    These changes comment out the Management declarations to show the
    default, and mention that network-management.yaml may be included.
    Since the Management network is disabled by default, it isn't
    necessary to noop it here. This change also places the Redis VIP
    in a more logical place next to the controller ports.

    Change-Id: I50a71b3ddf77bda2d213821da5e4260b503a6cb7
    Fixes-bug: 1602283

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/341146

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/341146
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=6e7dcd469d65cfd86f9e8ef6eee0924f642441bd
Submitter: Jenkins
Branch: stable/mitaka

commit 6e7dcd469d65cfd86f9e8ef6eee0924f642441bd
Author: Dan Sneddon <email address hidden>
Date: Wed Jun 22 14:50:23 2016 -0700

    Fix network-isolation.yaml to stop clobbering Management net

    The network-isolation.yaml file explicitly set the Management
    network to None and the ports to noop.yaml. This resulted in the
    Management network being disabled if network-management.yaml was
    included before network-isolation.yaml.

    These changes comment out the Management declarations to show the
    default, and mention that network-management.yaml may be included.
    Since the Management network is disabled by default, it isn't
    necessary to noop it here. This change also places the Redis VIP
    in a more logical place next to the controller ports.

    Change-Id: I50a71b3ddf77bda2d213821da5e4260b503a6cb7
    Fixes-bug: 1602283
    (cherry picked from commit bf41f8f358fc2ae7dde1f7be94aa9027a27db09d)