summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-07-15 13:22:22 -0400
committerTim Rozet <trozet@redhat.com>2016-07-15 17:16:17 -0400
commit98fe31feaba1db62445d8a006dd52fd5e12eba1d (patch)
tree624af0fa0faad310fc70544f2e4af213156faafd /build
parent88d5b2462933cce79cb059c81e007ec83ee2cd9e (diff)
Fixes public vlan network settings
JIRA: APEX-201 Change-Id: I3ba8d5e38e203bb4f23679a3b91de97c591de146 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/network-environment.yaml2
-rw-r--r--build/nics-template.yaml.jinja22
2 files changed, 2 insertions, 2 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index baf8b187..f1503feb 100644
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -41,7 +41,7 @@ resource_registry:
parameter_defaults:
- #NeutronExternalNetworkBridge: "''"
+ NeutronExternalNetworkBridge: 'br-ex'
ControlPlaneSubnetCidr: "24"
ControlPlaneDefaultRoute: 192.0.2.1
ExternalNetCidr: 192.168.37.0/24
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 91d0c478..3fac43b8 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'] is number or vlans['storage_network'] is number or vlans['api_network'] is number %}
+ {%- if vlans['private_network'] is number or vlans['storage_network'] is number or vlans['api_network'] is number or vlans['public_network'] is number %}
type: ovs_bridge
name: {get_input: bridge_name}
members: