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

3 files changed, 21 insertions, 21 deletions

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
index 994f1c65c..cb0ae7d8d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
@@ -24,7 +24,7 @@ parameters:
     reclass_config_master: ${_param:opnfv_infra_config_pxe_address}
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    single_address: 172.16.10.100
+    single_address: ${_param:opnfv_infra_config_address}
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
@@ -71,11 +71,11 @@ parameters:
             single_address: ${_param:openstack_control_node01_address}
         openstack_compute_node01:
           params:
-            single_address: 172.16.10.101
-            tenant_address: 10.1.0.101
-            external_address: 10.16.0.101
+            single_address: ${_param:opnfv_openstack_compute_node01_control_address}
+            tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
+            external_address: ${_param:opnfv_openstack_compute_node01_external_address}
         openstack_compute_node02:
           params:
-            single_address: 172.16.10.102
-            tenant_address: 10.1.0.102
-            external_address: 10.16.0.102
+            single_address: ${_param:opnfv_openstack_compute_node02_control_address}
+            tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
+            external_address: ${_param:opnfv_openstack_compute_node02_external_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
index 2affd3db8..58561d801 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
@@ -6,21 +6,23 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
+classes:
+  - cluster.all-mcp-arch-common
 parameters:
   _param:
     # infra service addresses
-    infra_config_address: 172.16.10.100
+    infra_config_address: ${_param:opnfv_infra_config_address}
     # openstack service addresses
-    openstack_control_address: 172.16.10.11
-    openstack_control_node01_address: 172.16.10.11
-    openstack_control_node02_address: 172.16.10.12
-    openstack_control_node03_address: 172.16.10.13
+    openstack_control_address: ${_param:opnfv_openstack_control_node01_address}
+    openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
+    openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
+    openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.124
+    openstack_gateway_address: ${_param:opnfv_openstack_gateway_node01_address}
     control_address: ${_param:openstack_control_address}
     ntp_strata_host1: 1.se.pool.ntp.org
     ntp_strata_host2: 0.se.pool.ntp.org
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
index 5d2efb53f..f62e20448 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
@@ -14,7 +14,7 @@ parameters:
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: 10.16.0.11
+    cluster_public_host: ${_param:opnfv_openstack_control_node01_external_address}
     neutron_public_protocol: http
     neutron_control_dvr: 'False'
     neutron_l3_ha: 'False'
@@ -31,11 +31,11 @@ parameters:
     cluster_vip_address: ${_param:cluster_public_host}
     cluster_local_address: ${_param:openstack_control_address}
     cluster_node01_hostname: ctl01
-    cluster_node01_address: 172.16.10.11
+    cluster_node01_address: ${_param:opnfv_openstack_control_node01_address}
     cluster_node02_hostname: ctl02
-    cluster_node02_address: 172.16.10.12
+    cluster_node02_address: ${_param:opnfv_openstack_control_node02_address}
     cluster_node03_hostname: ctl03
-    cluster_node03_address: 172.16.10.13
+    cluster_node03_address: ${_param:opnfv_openstack_control_node03_address}
     rabbitmq_secret_key: opnfv_secret
     rabbitmq_admin_password: opnfv_secret
     rabbitmq_openstack_password: opnfv_secret
@@ -52,8 +52,6 @@ parameters:
     ceilometer_database_host: ${_param:cluster_local_address}
     cinder_version: ${_param:openstack_version}
     cinder_service_host: ${_param:cluster_local_address}
-    ceilometer_graphite_publisher_host: 172.16.10.107
-    ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
     nova_service_host: ${_param:cluster_local_address}
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
@@ -124,12 +122,12 @@ parameters:
             - gtw01
             - gtw01.${_param:cluster_domain}
         cmp01:
-          address: 172.16.10.101
+          address: ${_param:opnfv_openstack_compute_node01_control_address}
           names:
             - cmp01
             - cmp01.${_param:cluster_domain}
         cmp02:
-          address: 172.16.10.102
+          address: ${_param:opnfv_openstack_compute_node02_control_address}
           names:
             - cmp02
             - cmp02.${_param:cluster_domain}