openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unused jinja code in network-isolation environment"

Browse Source
This commit is contained in:
Zuul 2019-01-17 01:49:46 +00:00 committed by Gerrit Code Review
commit c296b305e0
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
environments/network-isolation-v6.j2.yaml
View File

@ -1,11 +1,3 @@
{%- set primary_role = [roles[0]] -%}
{%- for role in roles -%}
{%- if 'primary' in role.tags and 'controller' in role.tags -%}
{%- set _ = primary_role.pop() -%}
{%- set _ = primary_role.append(role) -%}
{%- endif -%}
{%- endfor -%}
{%- set primary_role_name = primary_role[0].name -%}
# NOTE: This template is now deprecated, and is only included for compatibility # NOTE: This template is now deprecated, and is only included for compatibility
# when upgrading a deployment where this template was originally used. For new # when upgrading a deployment where this template was originally used. For new
# deployments, set "ipv6: true" on desired networks in network_data.yaml, and # deployments, set "ipv6: true" on desired networks in network_data.yaml, and
@ -14,7 +6,6 @@
# Enable the creation of Neutron networks for isolated Overcloud # Enable the creation of Neutron networks for isolated Overcloud
# traffic and configure each role to assign ports (related # traffic and configure each role to assign ports (related
# to that role) on these networks. # to that role) on these networks.
# primary role is: {{primary_role_name}}
resource_registry: resource_registry:
# networks as defined in network_data.yaml # networks as defined in network_data.yaml
{%- for network in networks if network.enabled|default(true) %} {%- for network in networks if network.enabled|default(true) %}

9
environments/network-isolation.j2.yaml
View File

@ -1,15 +1,6 @@
{%- set primary_role = [roles[0]] -%}
{%- for role in roles -%}
{%- if 'primary' in role.tags and 'controller' in role.tags -%}
{%- set _ = primary_role.pop() -%}
{%- set _ = primary_role.append(role) -%}
{%- endif -%}
{%- endfor -%}
{%- set primary_role_name = primary_role[0].name -%}
# Enable the creation of Neutron networks for isolated Overcloud # Enable the creation of Neutron networks for isolated Overcloud
# traffic and configure each role to assign ports (related # traffic and configure each role to assign ports (related
# to that role) on these networks. # to that role) on these networks.
# primary role is: {{primary_role_name}}
resource_registry: resource_registry:
# networks as defined in network_data.yaml # networks as defined in network_data.yaml
{%- for network in networks if network.enabled|default(true) %} {%- for network in networks if network.enabled|default(true) %}