[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>

2 files changed, 1 insertions, 55 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
index 3b7ba99e0..5835110f4 100644
--- 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
@@ -9,4 +9,4 @@
 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
+  - cluster.all-mcp-arch-common.infra.config_dpdk_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
deleted file mode 100644
index 08e8ab717..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-##############################################################################
-# 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.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_admin = conf['idf']['net_config']['admin']['interface'] -%}
-    {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%}
-    {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%}
-    {%- set idx_public = conf['idf']['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['idf']['net_config']['admin']['vlan'] -%}
-    {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%}
-    {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%}
-    {%- set vlan_public = conf['idf']['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 }}"'