summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-29 16:17:31 -0400
committerTim Rozet <trozet@redhat.com>2016-06-30 15:15:04 -0400
commitd47d4a5ef7c78c3ca84450a2164ec63a5697e110 (patch)
tree9aa731f329b4d81cc5cb7e54c3f0ae29c8f7a689 /build
parent1e1d187d9c64229ddfb97925bb1b46a1754e6cd1 (diff)
Fixes nic template rendering
Issue where in default network_settings, api_network is not specified. This means that the settings do not have api_network in its output, but the nic template checks to see if api_network vlan is native in its logic. This patch assumes a vlan will be numeric. A blank value or a value of 'native' will not be numeric therefore default is expanded to allow blank values as non-vlan networks. Also fixes controller to always have br-ex. Change-Id: Ibebb231901e653127175aef194eec708e8507da2 Signed-off-by: Tim Rozet <trozet@redhat.com> Signed-off-by: Dan Radez <dradez@redhat.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/nics-template.yaml.jinja221
1 files changed, 16 insertions, 5 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 1c51ab7f..455ae0f3 100644
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -85,7 +85,7 @@ resources:
os_net_config:
network_config:
-
- {%- if vlans['private_network'] != 'native' or vlans['storage_network'] != 'native' or vlans['api_network'] != 'native' %}
+ {%- if vlans['private_network'] is number or vlans['storage_network'] is number or vlans['api_network'] is number %}
type: ovs_bridge
name: {get_input: bridge_name}
members:
@@ -94,7 +94,7 @@ resources:
name: nic1
# force the MAC address of the bridge to this interface
primary: true
- {%- if 'public_network' in enabled_networks and vlans['private_network'] != 'native' %}
+ {%- if 'public_network' in enabled_networks and vlans['private_network'] is number %}
-
type: vlan
vlan_id: {get_param: ExternalNetworkVlanID}
@@ -106,7 +106,7 @@ resources:
default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}
{%- endif %}
- {%- if 'private_network' in enabled_networks and vlans['private_network'] != 'native' %}
+ {%- if 'private_network' in enabled_networks and vlans['private_network'] is number %}
-
type: vlan
vlan_id: {get_param: TenantNetworkVlanID}
@@ -114,7 +114,7 @@ resources:
-
ip_netmask: {get_param: TenantIpSubnet}
{%- endif %}
- {%- if 'storage_network' in enabled_networks and vlans['storage_network'] != 'native' %}
+ {%- if 'storage_network' in enabled_networks and vlans['storage_network'] is number %}
-
type: vlan
vlan_id: {get_param: StorageNetworkVlanID}
@@ -122,7 +122,7 @@ resources:
-
ip_netmask: {get_param: StorageIpSubnet}
{%- endif %}
- {%- if 'api_network' in enabled_networks and vlans['api_network'] != 'native' %}
+ {%- if 'api_network' in enabled_networks and vlans['api_network'] is number %}
-
type: vlan
vlan_id: {get_param: InternalApiNetworkVlanID}
@@ -212,6 +212,17 @@ resources:
name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
# force the MAC address of the bridge to this interface
primary: true
+ {%- if role == 'controller' %}
+ dns_servers: {get_param: DnsServers}
+ addresses:
+ -
+ ip_netmask: {get_param: ExternalIpSubnet}
+ routes:
+ -
+ default: true
+ ip_netmask: 0.0.0.0/0
+ next_hop: {get_param: ExternalInterfaceDefaultRoute}
+ {%- endif %}
{%- endif %}
{%- if 'storage_network' in enabled_networks and vlans['storage_network'] == 'native' %}
-