aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml36
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j290
2 files changed, 91 insertions, 35 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
index 3bd705c6c..757295a04 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -22,6 +22,7 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
+ - cluster.baremetal-mcp-ocata-common.infra.kvm_init
parameters:
_param:
linux_system_codename: xenial
@@ -31,7 +32,6 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
- deploy_nic: ${_param:opnfv_baremetal_primary_nic}
# {dhcp,single}_nic are not used, but referenced
dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
@@ -136,37 +136,3 @@ parameters:
network.remote-dio: 'On'
diagnostics.client-log-level: WARNING
diagnostics.brick-log-level: WARNING
- linux:
- network:
- interface:
- deploy:
- enabled: true
- type: eth
- proto: manual
- address: 0.0.0.0
- netmask: 255.255.255.0
- name: ${_param:deploy_nic}
- noifupdown: true
- br-mgmt:
- enabled: true
- proto: dhcp
- type: bridge
- name_servers: ${_param:opnfv_name_servers}
- use_interfaces:
- - ${_param:deploy_nic}
- noifupdown: true
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:deploy_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2
new file mode 100644
index 000000000..08abc36f2
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2
@@ -0,0 +1,90 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #}
+{%- if conf.net_config is defined and conf.idf is defined -%}
+ {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#}
+
+ {#- Determine interface index for each network (plumbing vars) -#}
+ {%- set idx_admin = conf['net_config']['admin']['interface'] -%}
+ {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%}
+ {%- set idx_private = conf['net_config']['private']['interface'] -%}
+ {%- set idx_public = conf['net_config']['public']['interface'] -%}
+
+ {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#}
+ {%- set node = conf['idf']['fuel']['network']['node'][0] -%}
+ {%- set nic_admin = node['interfaces'][idx_admin] -%}
+ {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
+ {%- set nic_private = node['interfaces'][idx_private] -%}
+ {%- set nic_public = node['interfaces'][idx_public] -%}
+
+ {#- PCI addresses (only for DPDK on private) -#}
+ {%- set bus_private = node['busaddr'][idx_private] -%}
+
+ {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#}
+ {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%}
+ {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%}
+ {%- set vlan_private = conf['net_config']['private']['vlan'] -%}
+ {%- set vlan_public = conf['net_config']['public']['vlan'] -%}
+{%- else -%}
+ {%- set nic_admin = 'enp6s0' -%}
+ {%- set nic_mgmt = 'enp6s0' -%}
+ {%- set nic_private = None -%}
+ {%- set nic_public = None -%}
+ {%- set vlan_admin = 'native' -%}
+ {%- set vlan_mgmt = '300' -%}
+ {%- set vlan_private = '1000' -%}
+{%- endif -%}
+
+{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#}
+{%- set nics = { nic_admin: True, nic_mgmt: True, nic_public: True } -%}
+
+{%- set vlans = { vlan_admin: nic_admin, vlan_mgmt: nic_mgmt, vlan_public: nic_public } -%}
+---
+parameters:
+ linux:
+ network:
+ interface:
+{%- for nic in nics %}
+ {{ nic }}:
+ enabled: true
+ type: eth
+ proto: manual
+ address: 0.0.0.0
+ netmask: 255.255.255.0
+ name: {{ nic }}
+ noifupdown: true
+{%- endfor %}
+
+{%- for vlan in vlans %}
+ {%- if vlan and vlan != 'native' %}
+ {{ vlans[vlan] }}.{{ vlan }}:
+ enabled: true
+ proto: manual
+ type: vlan
+ name: {{ vlans[vlan] }}.{{ vlan }}
+ use_interfaces:
+ - {{ vlans[vlan] }}
+ {%- endif %}
+{%- endfor %}
+
+ br-mgmt:
+ enabled: true
+ proto: dhcp
+ type: bridge
+ name_servers: ${_param:opnfv_name_servers}
+ use_interfaces:
+ - {{ nic_admin }}{% if vlan_admin and vlan_admin != 'native' %}.{{ vlan_admin }}{% endif %}
+ noifupdown: true
+ br-ctl:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - {{ nic_mgmt }}{% if vlan_mgmt and vlan_mgmt != 'native' %}.{{ vlan_mgmt }}{% endif %}