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

4 files changed, 5 insertions, 6 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
index 89acc4a4b..037b3579f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
@@ -23,5 +23,5 @@ parameters:
             single_address: ${_param:opendaylight_service_host}
         openstack_gateway_node01:
           params:
-            tenant_address: 10.1.0.124
-            external_address: 10.16.0.124
+            tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+            external_address: ${_param:opnfv_openstack_gateway_node01_external_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
index 7575d89b8..e5bacffdc 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
@@ -8,11 +8,10 @@
 ---
 classes:
   - system.linux.system.single
-  - cluster.all-mcp-arch-common
   - cluster.virtual-mcp-pike-common-noha.init_options
   - cluster.virtual-mcp-pike-odl-noha.infra
   - cluster.virtual-mcp-pike-odl-noha.openstack
 
 parameters:
   _param:
-    opendaylight_service_host: 172.16.10.111
+    opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_single_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
index 49870805c..6aef9b46f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
@@ -33,7 +33,7 @@ parameters:
           proto: static
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
-          gateway: 10.1.0.124
+          gateway: ${_param:opnfv_openstack_gateway_node01_tenant_address}
           use_interfaces:
             - ${_param:tenant_interface}
         br-floating:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
index cbf4e692e..4607190c7 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
@@ -16,7 +16,7 @@ parameters:
     network:
       host:
         odl01:
-          address: 172.16.10.111
+          address: ${_param:opnfv_opendaylight_server_node01_single_address}
           names:
             - odl01
             - odl01.${_param:cluster_domain}