commit 2335fa0a8a862c33e8c380d443e1d4c95cf3df50
author Ales Komarek <akomarek@mirantis.com> Thu Dec 21 13:02:53 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Thu Dec 21 13:02:53 2017 +0000
tree 8f4c6ed321c96a001641c70a0fbafc381c3c0a41
parent c7a3efc494d5af2c28168ff91dc6064a78338fa1
parent 86fb7d42fa9639a9295b16741e4860e1f8489b9a

Merge "Use cicd-lab-dev.local as ldap domain in drivetrain_ha"

classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml

diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
index cd99283..d299e05 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
@@ -127,7 +127,7 @@
     # OpenLDAP
     openldap_organisation: ${_param:cluster_name}
     openldap_dn: 'dc=cicd-lab-dev,dc=local'
-    openldap_domain: ${linux:system:domain}
+    openldap_domain: 'cicd-lab-dev.local'
     openldap_admin_password: password
     openldap_config_password: password
     openldap_readonly_password: password

classes/cluster/drivetrain-ha/cicd/control/init.yml

diff --git a/classes/cluster/drivetrain-ha/cicd/control/init.yml b/classes/cluster/drivetrain-ha/cicd/control/init.yml
index 81ad1ad..ee1a0e9 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/init.yml
@@ -129,7 +129,7 @@
     # OpenLDAP
     openldap_organisation: ${_param:cluster_name}
     openldap_dn: 'dc=cicd-lab-dev,dc=local'
-    openldap_domain: ${linux:system:domain}
+    openldap_domain: 'cicd-lab-dev.local'
     openldap_admin_password: password
     openldap_config_password: password
     openldap_readonly_password: password