summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-17 18:12:25 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-18 22:01:58 +0200
commitc360b972649028d2613fc8561899c2c8b7f71832 (patch)
tree96fcde4c5ea5d189210f50aa3e0c91f336f769e9 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra
parent92530f89c061b0070766e431f839feb368e2e4ac (diff)
[baremetal] PDF-based network config
This change extends current PDF/IDF support with: - dynamic interface / vlan definition; - dynamic interface and/or bridge allocation of installer networks on top of interfaces (physical or vlans); This allows us to drop hardcoded interface names and vlan / bridge configuration in favor of a runtime determined model based on PDF/IDF. For now, we duplicate common jinja variable definitions in each template, but this will later be moved to a common include file. JIRA: FUEL-275 Change-Id: Ia80a66dbdf898b0bd0a4fb99d069ce9ebe33fa65 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml13
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j254
2 files changed, 55 insertions, 12 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index 7bd8c37f1..149fff5ff 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -9,15 +9,4 @@
classes:
- cluster.baremetal-mcp-ocata-common.infra.config
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-parameters:
- reclass:
- storage:
- node:
- openstack_compute_node01:
- params:
- dpdk0_name: enp7s0
- dpdk0_pci: '"0000:07:00.0"'
- openstack_compute_node02:
- params:
- dpdk0_name: enp7s0
- dpdk0_pci: '"0000:07:00.0"'
+ - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2
new file mode 100644
index 000000000..5511ed774
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml.j2
@@ -0,0 +1,54 @@
+##############################################################################
+# 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 -%}
+---
+parameters:
+ reclass:
+ storage:
+ node:
+ openstack_compute_node01:
+ params:
+ dpdk0_name: {{ nic_private }}
+ dpdk0_pci: '"{{ bus_private }}"'
+ openstack_compute_node02:
+ params:
+ dpdk0_name: {{ nic_private }}
+ dpdk0_pci: '"{{ bus_private }}"'