diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-18 12:11:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-18 12:11:15 +0000 |
| commit | 73e52458f6f22ec453ec08cc0960d8b8e0ce45fe (patch) | |
| tree | ebb5efde5b0af111c1c2de0b8416cdade7f73266 /build | |
| parent | ddecb36accd3f229ccee6113ee04b9e623885203 (diff) | |
| parent | 98fe31feaba1db62445d8a006dd52fd5e12eba1d (diff) | |
Merge "Fixes public vlan network settings"
Diffstat (limited to 'build')
| -rw-r--r-- | build/network-environment.yaml | 2 | ||||
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 2 |
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: |