Merge "[ha] Add barbican to nginx on proxy nodes"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_compute_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
index b6cba0c..20f9b3c 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
@@ -7,6 +7,14 @@
 ##############################################################################
 {#- NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #}
 {%- import 'net_map.j2' as nm with context %}
+{%- import 'net_macros.j2' as ma with context %}
+{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
+{%- set nics = { nm.cmp001.nic_mgmt: True, nm.cmp001.nic_private: True } %}
+{%- set vlans = { nm.vlan_mgmt: nm.cmp001.nic_mgmt } %}
+{%- if '-ovs-' not in conf.MCP_DEPLOY_SCENARIO %}
+{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
+{%- do vlans.update({ vlan_private_start: nm.cmp001.nic_private }) %}
+{%- endif %}
 ---
 parameters:
   _param:
@@ -19,11 +27,9 @@ parameters:
 {%- else %}
     ~cinder_lvm_devices: ['/dev/sda1']
 {%- endif %}
-    primary_interface: {{ nm.cmp001.nic_mgmt }}
-    tenant_interface: {{ nm.cmp001.nic_private }}
-    external_interface: {{ nm.cmp001.nic_public }}
   linux:
     network:
+      ovs_nowait: true
       bridge: openvswitch
       interface:
         pxe_admin_int:
@@ -35,17 +41,16 @@ parameters:
           netmask: ${_param:opnfv_net_admin_mask}
           mtu: ${_param:interface_mtu}
           noifupdown: true
-        primary_interface:
-          enabled: true
-          name: ${_param:primary_interface}
-          proto: manual
-          type: eth
-        tenant_interface:
-          enabled: true
-          name: ${_param:tenant_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
+
+{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #}
+{%- if nm.cmp001.nic_admin in nics %}
+  {%- do nics.pop(nm.cmp001.nic_admin) %}
+{%- endif %}
+
+{{ ma.linux_network_interfaces_nic(nics) }}
+
+{{ ma.linux_network_interfaces_vlan(vlans) }}
+
         br-mgmt:
           enabled: true
           type: bridge
@@ -53,4 +58,4 @@ parameters:
           address: ${_param:single_address}
           netmask: ${_param:opnfv_net_mgmt_mask}
           use_interfaces:
-            - ${_param:primary_interface}
+            - {{ ma.interface_str(nm.cmp001.nic_mgmt, nm.vlan_mgmt) }}