commit 6c0f29e2c8c9a97ed2975719f0beb7f18323ce74
author Marek Celoud <mceloud@mirantis.com> Mon Nov 13 15:09:16 2017 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> Mon Nov 13 15:09:16 2017 +0000
tree 9b5547ffd7b737a2c424ae6fda0fe9e053204fd1
parent dbdea620818c99821e6b4c286b5cd8e5d45115b0
parent 5fe6027e669895a61fbb64f1761b2bdb6f66761b

Merge "Return missed salt master class in drivetrain_ha"

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

diff --git a/classes/cluster/drivetrain-ha-clusters/infra/config.yml b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
index 5658e18..73af8b7 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/config.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
@@ -65,6 +65,7 @@
           name: ${_param:cicd_control_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
+          - cluster.${_param:cluster_name}.infra.config
           - cluster.${_param:cluster_name}.cicd.control.master
           params:
             salt_master_host: ${_param:reclass_config_master}

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 6e774ff..3fb5e9b 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -65,6 +65,7 @@
           name: ${_param:cicd_control_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
+          - cluster.${_param:cluster_name}.infra.config
           - cluster.${_param:cluster_name}.cicd.control.master
           params:
             salt_master_host: 127.0.0.1