summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-05 13:40:58 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-11 13:11:02 +0400
commit60eb5044f4236eced9dc5df4fb787359f166ee6d (patch)
tree73693e5d2e5df14ae305a2ac79c14c6885f6ada2 /mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra
parent24dad46d51e6740400effd037f14d99defc5eafd (diff)
[baremetal] Update openstack version to pike
Change-Id: If4208e937734df72b10aad259c65a2617ff5e19c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml12
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j254
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml19
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml11
5 files changed, 107 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml
new file mode 100644
index 000000000..3b7ba99e0
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+ - cluster.baremetal-mcp-pike-common-ha.infra.config
+ - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
+ - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config_pdf
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
new file mode 100644
index 000000000..5511ed774
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.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 }}"'
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml
new file mode 100644
index 000000000..e3dd53629
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml
@@ -0,0 +1,19 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+ - cluster.baremetal-mcp-pike-common-ha.infra
+ - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack
+parameters:
+ _param:
+ cluster_name: baremetal-mcp-pike-ovs-dpdk-ha
+ linux:
+ system:
+ service:
+ apt-daily.timer:
+ status: dead
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml
new file mode 100644
index 000000000..bb2087d70
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+ - cluster.baremetal-mcp-pike-common-ha.infra.kvm
+ - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml
new file mode 100644
index 000000000..fb55539f5
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# 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
+##############################################################################
+---
+classes:
+ - cluster.baremetal-mcp-pike-common-ha.infra.maas
+ - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra