diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-27 07:13:08 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 06:03:35 +0100 |
commit | 342b6bad34e8c949aa81adf711e6a357e56942d3 (patch) | |
tree | be03c0877ef6d95eda018736a24d36c228c05c47 /mcp/reclass/classes/cluster/all-mcp-arch-common/infra | |
parent | 7f2ca07e6822f99ef37c3f9ca6cce15ff00ffed8 (diff) |
[virtual] Parameterize cluster model based on PDF
- 10.1.0.0/24 (internal):
* 10.1.0.101 -> opnfv_openstack_compute_node01_tenant_address
* 10.1.0.124 -> opnfv_openstack_gateway_node01_tenant_address
- 172.16.10.0/24 (mgmt):
* 172.16.10.11 -> opnfv_openstack_control_node01_address
* 172.16.10.100 -> opnfv_infra_config_address
* 172.16.10.101 -> opnfv_openstack_compute_node01_control_address
* 172.16.10.111 -> opnfv_opendaylight_server_node01_single_address
* 172.16.10.124 -> opnfv_openstack_gateway_node01_address
- 10.16.0.0/24 (public):
* 10.16.0.11 -> opnfv_openstack_control_node01_external_address
* 10.16.0.101 -> opnfv_openstack_compute_node01_external_address
* 10.16.0.124 -> opnfv_openstack_gateway_node01_external_address
To re-use DPDK config baremetal template, move:
- cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config_pdf
+ cluster.all-mcp-arch-common.infra.config_dpdk_pdf
Drop unused 'ceilometer_graphite_publisher_host' (172.16.10.107).
JIRA: FUEL-322
Change-Id: I3aef3415bd696a7ae5b566af12af4733a50c2135
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/infra')
-rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 new file mode 100644 index 000000000..062e8a4fa --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 @@ -0,0 +1,33 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +{%- if conf.idf is defined and conf.idf.net_config is defined -%} + {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} + + {#- Determine interface index for each network (plumbing vars) -#} + {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} + + {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} + {%- set node = conf['idf']['fuel']['network']['node'][0] -%} + {%- set nic_private = node['interfaces'][idx_private] -%} + + {#- PCI addresses (only for DPDK on private) -#} + {%- set bus_private = node['busaddr'][idx_private] -%} +{%- 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 }}"' |