commit e487a7ea8c969fec8b08c15070bdc5baeaa6eb8a
author Vladimir Jigulin <vjigulin@mirantis.com> Thu Nov 16 17:02:24 2017 +0400
committer Vladimir Jigulin <vjigulin@mirantis.com> Mon Dec 04 11:17:41 2017 +0000
tree b29ca37e9f92d9cf9b9a6e2748f7e0497ecff192
parent 32be9b01c5705c35276bc10959c3ecf5814cc8c6

Fix typos and dups in drivetrain-ha infra configs

Change-Id: I2882fa2fe4514888fc304c2bdf551d5158ed0317

classes/cluster/drivetrain-ha/infra/config.yml

diff --git a/classes/cluster/drivetrain-ha/infra/config.yml b/classes/cluster/drivetrain-ha/infra/config.yml
index 3fb5e9b..a360806 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -48,12 +48,12 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-            cicd_control_node_node01_address:
+            cicd_control_node01_address:
               value_template: <<node_control_ip>>
         cicd_control_node02:
           expression: <<node_hostname>>__equals__cid02
           cluster_param:
-            cicd_control_node_node02_address:
+            cicd_control_node02_address:
               value_template: <<node_control_ip>>
         cicd_control_node03:
           expression: <<node_hostname>>__equals__cid03

classes/cluster/drivetrain-ha/infra/init.yml

diff --git a/classes/cluster/drivetrain-ha/infra/init.yml b/classes/cluster/drivetrain-ha/infra/init.yml
index 3d1efe2..d9fb296 100644
--- a/classes/cluster/drivetrain-ha/infra/init.yml
+++ b/classes/cluster/drivetrain-ha/infra/init.yml
@@ -12,7 +12,6 @@
     salt_api_password: hovno12345!
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     salt_master_base_environment: prd
-    salt_minion_ca_host: ${linux:network:fqdn}
     salt_master_host: ${_param:infra_config_deploy_address}
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master