summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-20 12:04:07 -0400
committerTim Rozet <trozet@redhat.com>2016-05-20 12:04:07 -0400
commit08c44e734c45fc370c8d34547a65e226d929075f (patch)
tree4ecd21d47c20c8d098453cb7927055d428d8a945
parente2a2aae5d7f8f3bee9404be3334beeac51d9bf5b (diff)
Fixes tenant network templates
We only support vxlan tenant network types in OPNFV. There is no need to create a br-tenant. Change-Id: Ib84cde7207375ea033518dce99309620f575cb69 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--build/nics-compute.yaml.jinja212
-rw-r--r--build/nics-controller.yaml.jinja212
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