Remove extra noop.yaml ports from network-isolation files.
The environments/network-isolation[-v6].yaml files have an
unneeded reference to network/ports/noop.yaml for unused
networks.
This introduces a regression where environment files that
define the networks and ports on a per-role basis can
cancel out other environment files. See bug # 1717322.
The overcloud-resource-registry.j2.yaml already uses noop.yaml
for every network on every role (whether or not the networks
are enabled, or whether the particular network is supposed
to be on a role. So having noop.yaml specified for every
role in network-isolation[-v6].yaml is not needed and can
cause issues with upgrades if the environments are not
included in a specific order.
Change-Id: If06407e5235587af090ede44674bf9c7e08e340e
Closes-bug: 1717322
(cherry picked from commit 9b08df3733257ac0fbc150a4071aec051e073ef7)
Reviewed: https:/ /review. openstack. org/505735 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=4e700bce608 ba711486c8f6a6b 2bcf72c4423794
Committed: https:/
Submitter: Jenkins
Branch: stable/pike
commit 4e700bce608ba71 1486c8f6a6b2bcf 72c4423794
Author: Dan Sneddon <email address hidden>
Date: Thu Sep 14 13:26:53 2017 -0600
Remove extra noop.yaml ports from network-isolation files.
The environments/ network- isolation[ -v6].yaml files have an ports/noop. yaml for unused
unneeded reference to network/
networks.
This introduces a regression where environment files that
define the networks and ports on a per-role basis can
cancel out other environment files. See bug # 1717322.
The overcloud- resource- registry. j2.yaml already uses noop.yaml isolation[ -v6].yaml is not needed and can
for every network on every role (whether or not the networks
are enabled, or whether the particular network is supposed
to be on a role. So having noop.yaml specified for every
role in network-
cause issues with upgrades if the environments are not
included in a specific order.
Change-Id: If06407e5235587 af090ede44674bf 9c7e08e340e 0fbc150a4071aec 051e073ef7)
Closes-bug: 1717322
(cherry picked from commit 9b08df3733257ac