Merge "Remove legacy network-isolation env files"
This commit is contained in:
commit
ce41c2a444
|
@ -1,44 +0,0 @@
|
|||
# ******************************************************************************
|
||||
# DEPRECATED: Modify networks used for custom roles by modifying the role file
|
||||
# in the roles/ directory, or disable the network entirely by setting network to
|
||||
# "enabled: false" in network_data.yaml.
|
||||
# ******************************************************************************
|
||||
# Enable the creation of Neutron networks for isolated Overcloud
|
||||
# traffic and configure each role to assign ports (related
|
||||
# to that role) on these networks. This version of the environment
|
||||
# has no dedicated VLAN for tunneling, for deployments that use
|
||||
# VLAN mode, flat provider networks, etc.
|
||||
resource_registry:
|
||||
# networks as defined in network_data.yaml, except for tenant net
|
||||
{%- for network in networks if network.enabled|default(true) and network.name != 'Tenant' %}
|
||||
OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endfor %}
|
||||
OS::TripleO::Network::Tenant: OS::Heat::None
|
||||
|
||||
# Port assignments for the VIPs
|
||||
{%- for network in networks if network.vip and network.name != 'Tenant' %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endfor %}
|
||||
|
||||
# Port assignments for each role are determined by the role definition.
|
||||
{%- for role in roles %}
|
||||
{#- Convert net map or net list to internal list of networks #}
|
||||
{#- NOTE(hjensas): For backward compatibility support role data with both #}
|
||||
{#- networks map (new schema) and network list (old schema). #}
|
||||
{%- if role.networks is mapping %}
|
||||
{%- set _role_networks = [] %}
|
||||
{%- for key, val in role.networks.items() %}
|
||||
{%- set _ = _role_networks.append(key) %}
|
||||
{%- endfor %}
|
||||
{%- else %}
|
||||
{%- set _role_networks = role.networks %}
|
||||
{%- endif %}
|
||||
# Port assignments for the {{role.name}} role.
|
||||
{%- for network in networks %}
|
||||
{%- if network.name in _role_networks and network.enabled|default(true) and network.name != 'Tenant'%}
|
||||
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- elif network.enabled|default(true) %}
|
||||
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/noop.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
|
@ -1,50 +0,0 @@
|
|||
# This file allows IPv6 deployment on tenant networks as well.
|
||||
# This should only be used for new deployments and not for upgrade
|
||||
# or update.
|
||||
{%- 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
|
||||
# when upgrading a deployment where this template was originally used. For new
|
||||
# deployments, set "ipv6: true" on desired networks in network_data.yaml, and
|
||||
# include network-isolation.yaml.
|
||||
#
|
||||
# Enable the creation of Neutron networks for isolated Overcloud
|
||||
# traffic and configure each role to assign ports (related
|
||||
# to that role) on these networks.
|
||||
# primary role is: {{primary_role_name}}
|
||||
resource_registry:
|
||||
# networks as defined in network_data.yaml
|
||||
{%- for network in networks if network.enabled|default(true) %}
|
||||
OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- endfor %}
|
||||
|
||||
# Port assignments for the VIPs
|
||||
{%- for network in networks if network.vip and network.enabled|default(true) %}
|
||||
{%- if network.external_resource_vip_id|default('') %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/external_resource_{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- else %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
|
||||
# Port assignments by role, edit role definition to assign networks to roles.
|
||||
{%- for role in roles %}
|
||||
# Port assignments for the {{role.name}}
|
||||
{%- for network in networks %}
|
||||
{%- if network.name in role.networks|default([]) and network.enabled|default(true) %}
|
||||
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{% endfor %}
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
# Enable IPv6 environment for Manila
|
||||
ManilaIPv6: True
|
|
@ -1,57 +0,0 @@
|
|||
# NOTE: This template is now deprecated, and is only included for compatibility
|
||||
# when upgrading a deployment where this template was originally used. For new
|
||||
# deployments, set "ipv6: true" on desired networks in network_data.yaml, and
|
||||
# include network-isolation.yaml.
|
||||
#
|
||||
# Enable the creation of Neutron networks for isolated Overcloud
|
||||
# traffic and configure each role to assign ports (related
|
||||
# to that role) on these networks.
|
||||
resource_registry:
|
||||
# networks as defined in network_data.yaml
|
||||
{%- for network in networks if network.enabled|default(true) %}
|
||||
{%- if network.name != 'Tenant' %}
|
||||
OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- else %}
|
||||
# IPv4 until OVS and Neutron support IPv6 tunnel endpoints
|
||||
OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
# Port assignments for the VIPs
|
||||
{%- for network in networks if network.vip and network.enabled|default(true) %}
|
||||
{%- if network.external_resource_vip_id|default('') %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/external_resource_{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- else %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
|
||||
# Port assignments by role, edit role definition to assign networks to roles.
|
||||
{%- for role in roles %}
|
||||
{#- Convert net map or net list to internal list of networks #}
|
||||
{#- NOTE(hjensas): For backward compatibility support role data with both #}
|
||||
{#- networks map (new schema) and network list (old schema). #}
|
||||
{%- if role.networks is mapping %}
|
||||
{%- set _role_networks = [] %}
|
||||
{%- for key, val in role.networks.items() %}
|
||||
{%- set _ = _role_networks.append(key) %}
|
||||
{%- endfor %}
|
||||
{%- else %}
|
||||
{%- set _role_networks = role.networks %}
|
||||
{%- endif %}
|
||||
# Port assignments for the {{role.name}}
|
||||
{%- for network in networks %}
|
||||
{%- if network.name in _role_networks and network.enabled|default(true) and network.name != 'Tenant' %}
|
||||
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}_v6.yaml
|
||||
{%- elif network.name in _role_networks and network.enabled|default(true) and network.name == 'Tenant' %}
|
||||
# IPv4 until OVS and Neutron support IPv6 tunnel endpoints
|
||||
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
# Enable IPv6 environment for Manila
|
||||
ManilaIPv6: True
|
|
@ -1,38 +0,0 @@
|
|||
# Enable the creation of Neutron networks for isolated Overcloud
|
||||
# traffic and configure each role to assign ports (related
|
||||
# to that role) on these networks.
|
||||
resource_registry:
|
||||
# networks as defined in network_data.yaml
|
||||
{%- for network in networks if network.enabled|default(true) %}
|
||||
OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endfor %}
|
||||
|
||||
# Port assignments for the VIPs
|
||||
{%- for network in networks if network.vip and network.enabled|default(true) %}
|
||||
{%- if network.external_resource_vip_id|default('') %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/external_resource_{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- else %}
|
||||
OS::TripleO::Network::Ports::{{network.name}}VipPort: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
# Port assignments by role, edit role definition to assign networks to roles.
|
||||
{%- for role in roles %}
|
||||
{#- Convert net map or net list to internal list of networks #}
|
||||
{#- NOTE(hjensas): For backward compatibility support role data with both #}
|
||||
{#- networks map (new schema) and network list (old schema). #}
|
||||
{%- if role.networks is mapping %}
|
||||
{%- set _role_networks = [] %}
|
||||
{%- for key, val in role.networks.items() %}
|
||||
{%- set _ = _role_networks.append(key) %}
|
||||
{%- endfor %}
|
||||
{%- else %}
|
||||
{%- set _role_networks = role.networks %}
|
||||
{%- endif %}
|
||||
# Port assignments for the {{role.name}}
|
||||
{%- for network in networks %}
|
||||
{%- if network.name in _role_networks and network.enabled|default(true) %}
|
||||
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: ../network/ports/{{network.name_lower|default(network.name.lower())}}.yaml
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
Loading…
Reference in New Issue