summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j212
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j211
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j29
m---------mcp/scripts/pharos0
4 files changed, 30 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index b4afdd9d1..7ee1aa13f 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -163,11 +163,21 @@ parameters:
primary_interface:
enabled: true
name: ${_param:primary_interface}
+ type: eth
+{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) and (nm.vlan_mgmt | int > 0) %}
+ proto: manual
mtu: ${_param:interface_mtu}
+ primary_interface_vlan:
+ enabled: true
+ type: vlan
+ name: ${_param:primary_interface}.{{ nm.vlan_mgmt }}
+ use_interfaces:
+ - ${_param:primary_interface}
+{%- endif %}
proto: static
+ mtu: ${_param:interface_mtu}
address: ${_param:infra_maas_node01_address}
netmask: ${_param:opnfv_net_mgmt_mask}
- type: eth
pxe_admin_interface:
enabled: true
name: ${_param:pxe_admin_interface}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
index 6bc508387..0e880c558 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
@@ -40,8 +40,17 @@ parameters:
single:
enabled: true
type: eth
- proto: static
name: ${_param:single_nic}
+{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) and (nm.vlan_mgmt | int > 0) %}
+ proto: manual
+ single_vlan:
+ enabled: true
+ type: vlan
+ name: ${_param:single_nic}.{{ nm.vlan_mgmt }}
+ use_interfaces:
+ - ${_param:single_nic}
+{%- endif %}
+ proto: static
address: ${_param:single_address}
netmask: ${_param:opnfv_net_mgmt_mask}
pxe_admin_int:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
index ac53e8225..dc31a93ca 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml.j2
@@ -29,6 +29,15 @@ parameters:
enabled: true
name: ${_param:opnfv_fn_vm_secondary_interface}
type: eth
+{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) and (nm.vlan_mgmt | int > 0) %}
+ proto: manual
+ single_int_vlan:
+ enabled: true
+ type: vlan
+ name: ${_param:opnfv_fn_vm_secondary_interface}.{{ nm.vlan_mgmt }}
+ use_interfaces:
+ - ${_param:opnfv_fn_vm_secondary_interface}
+{%- endif %}
proto: static
address: ${_param:single_address}
netmask: ${_param:opnfv_net_mgmt_mask}
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
-Subproject 2b78607e0252eed27f1ed50134c55e01f12a749
+Subproject 1b233cfbf7b42aaf951f175e9cf818d2b842856