openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add some air - blank line between network's in net configs"

Browse Source
This commit is contained in:
Zuul
2018-07-24 01:34:18 +00:00
committed by Gerrit Code Review
parent 36118fceb4 f3d74a6449
commit d4764a5801
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
network/config/bond-with-vlans/controller-no-external.j2.yaml
View File

@@ -17,7 +17,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -37,7 +37,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/bond-with-vlans/controller-v6.j2.yaml
View File

@@ -15,7 +15,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -35,7 +35,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/bond-with-vlans/role.role.j2.yaml
View File

@@ -13,7 +13,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -33,7 +33,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/multiple-nics/compute-dvr.j2.yaml
View File

@@ -15,7 +15,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -35,7 +35,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/multiple-nics/controller-v6.j2.yaml
View File

@@ -14,7 +14,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -34,7 +34,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/multiple-nics/role.role.j2.yaml
View File

@@ -13,7 +13,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -33,7 +33,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml
View File

@@ -14,7 +14,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -34,7 +34,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
View File

@@ -13,7 +13,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -33,7 +33,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/single-nic-vlans/controller-no-external.j2.yaml
View File

@@ -17,7 +17,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -37,7 +37,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/single-nic-vlans/controller-v6.j2.yaml
View File

@@ -14,7 +14,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -34,7 +34,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.

4
network/config/single-nic-vlans/role.role.j2.yaml
View File

@@ -13,7 +13,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
{%- for network in networks %}
{% for network in networks %}
{{network.name}}IpSubnet:
default: ''
description: IP address/subnet on the {{network.name_lower}} network
@@ -33,7 +33,7 @@ parameters:
description: default route for the {{network.name_lower}} network
type: string
{%- endif %}
{%- endfor %}
{% endfor %}
DnsServers: # Override this via parameter_defaults
default: []
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.