diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-05-20 19:05:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-20 19:05:36 +0000 |
| commit | d15f7639b32faf16e4bf9010e7a5f2aa86ff4e03 (patch) | |
| tree | 30980fd89fd1903ff3171dfc43d69eaf03ae70bd | |
| parent | 1813eb19f734b3b5661b697469ff075bc06a79eb (diff) | |
| parent | 08c44e734c45fc370c8d34547a65e226d929075f (diff) | |
Merge "Fixes tenant network templates"
| -rw-r--r-- | build/nics-compute.yaml.jinja2 | 12 | ||||
| -rw-r--r-- | build/nics-controller.yaml.jinja2 | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/build/nics-compute.yaml.jinja2 b/build/nics-compute.yaml.jinja2 index 12d90596..3a73bbd8 100644 --- a/build/nics-compute.yaml.jinja2 +++ b/build/nics-compute.yaml.jinja2 @@ -106,20 +106,12 @@ resources: {%- set nic_index = 2 %} {%- if 'private_network' in enabled_networks %} - - # Create a bridge which can also be used for VLAN-mode bridge mapping - type: ovs_bridge - name: br-tenant + type: interface + name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} use_dhcp: false addresses: - ip_netmask: {get_param: TenantIpSubnet} - members: - - - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} - use_dhcp: false - # force the MAC address of the bridge to this interface - primary: true {%- endif %} {%- if external_net_type == "interface" %} - diff --git a/build/nics-controller.yaml.jinja2 b/build/nics-controller.yaml.jinja2 index d135e2e5..d97ee394 100644 --- a/build/nics-controller.yaml.jinja2 +++ b/build/nics-controller.yaml.jinja2 @@ -104,20 +104,12 @@ resources: {%- set nic_index = 2 %} {%- if 'private_network' in enabled_networks %} - - # Create a bridge which can also be used for VLAN-mode bridge mapping - type: ovs_bridge - name: br-tenant + type: interface + name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} use_dhcp: false addresses: - ip_netmask: {get_param: TenantIpSubnet} - members: - - - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} - use_dhcp: false - # force the MAC address of the bridge to this interface - primary: true {%- endif %} - type: ovs_bridge |