summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/nics-template.yaml.jinja217
-rw-r--r--build/opnfv-environment.yaml1
2 files changed, 9 insertions, 9 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 3fac43b8..0680a26f 100644
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -91,7 +91,7 @@ resources:
members:
-
type: interface
- name: nic1
+ name: {{ nics[role]['admin_network'] }}
# force the MAC address of the bridge to this interface
primary: true
{%- if 'public_network' in enabled_networks and vlans['public_network'] is number %}
@@ -132,7 +132,7 @@ resources:
{%- endif %}
{%- else %}
type: interface
- name: nic1
+ name: {{ nics[role]['admin_network'] }}
{%- endif %}
use_dhcp: false
dns_servers: {get_param: DnsServers}
@@ -153,7 +153,6 @@ resources:
next_hop: {get_param: ControlPlaneDefaultRoute}
{%- endif %}
- {%- set nic_index = 2 %}
{%- if 'private_network' in enabled_networks and vlans['private_network'] == 'native' %}
{%- if ovs_dpdk_bridge == 'br-phy' and role == 'compute' %}
-
@@ -166,7 +165,7 @@ resources:
members:
-
type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+ name: {{ nics[role]['private_network'] }}
# force the MAC address of the bridge to this interface
primary: true
-
@@ -176,7 +175,7 @@ resources:
{%- else %}
-
type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+ name: {{ nics[role]['private_network'] }}
use_dhcp: false
addresses:
-
@@ -186,7 +185,7 @@ resources:
{%- if 'public_network' in enabled_networks and external_net_type == 'interface' and vlans['public_network'] == 'native' %}
-
type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+ name: {{ nics[role]['public_network'] }}
{%- if role == 'controller' %}
dns_servers: {get_param: DnsServers}
{%- endif %}
@@ -209,7 +208,7 @@ resources:
members:
-
type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+ name: {{ nics[role]['public_network'] }}
# force the MAC address of the bridge to this interface
primary: true
{%- if role == 'controller' %}
@@ -227,7 +226,7 @@ resources:
{%- if 'storage_network' in enabled_networks and vlans['storage_network'] == 'native' %}
-
type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+ name: {{ nics[role]['storage_network'] }}
use_dhcp: false
addresses:
-
@@ -236,7 +235,7 @@ resources:
{%- if 'api_network' in enabled_networks and vlans['api_network'] == 'native' %}
-
type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+ name: {{ nics[role]['api_network'] }}
use_dhcp: false
addresses:
-
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index fe37aba8..0f841529 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -6,6 +6,7 @@ parameters:
OvercloudControlFlavor: control
OvercloudComputeFlavor: compute
ControllerEnableSwiftStorage: false
+# CloudDomain:
EnableSahara: false
ExtraConfig:
tripleo::ringbuilder::build_ring: False