pod_config: cleanup: Drop infra_compute_*_address

Our PDF installer adapter defines 3 unused reclass params that are
misleading, so drop them (infra_compute_node{01,02,03}_address).

Change-Id: I0ca49b73add543c8f03b14ed4d805ce55f973bb5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit e48d4876833270b9139ca8196eef2c13f44effcc)

diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
index e5b852f..a3a78d6 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example
@@ -12,9 +12,6 @@ parameters:
     opnfv_infra_config_address: 10.167.4.100
     opnfv_infra_maas_node01_address: 10.167.4.3
     opnfv_infra_maas_node01_deploy_address: 192.168.11.3
-    opnfv_infra_compute_node01_address: 10.167.4.141
-    opnfv_infra_compute_node02_address: 10.167.4.142
-    opnfv_infra_compute_node03_address: 10.167.4.143
     opnfv_infra_kvm_address: 10.167.4.140
     opnfv_infra_kvm_node01_address: 10.167.4.141
     opnfv_infra_kvm_node02_address: 10.167.4.142

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
index 3d3f8df..a5e621b 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
@@ -28,9 +28,6 @@ parameters:
     infra_config_deploy_address: ${_param:reclass_config_master}
     infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
     infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
-    infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
-    infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
-    infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}
 
     infra_kvm_address: ${_param:opnfv_infra_kvm_address}
     infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}

diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 0a17807..74f5df2 160000 (submodule)
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e
+Subproject commit 74f5df259264c330637120ace4652c3a25aae255