commit 6ee46cf429c861a4a044367a37c87f1478889765
author Ales Komarek <akomarek@mirantis.com> Thu Dec 21 13:03:03 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Thu Dec 21 13:03:03 2017 +0000
tree dfabdaff4b033f6a96933dacd24e9a83615eaa1d
parent 2335fa0a8a862c33e8c380d443e1d4c95cf3df50
parent dc72b303ff4e76f0cad243fc4fe0fed3d6c57452

Merge "Use glusterfs ppa repo 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 7a0cdc1..4b67eec 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/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

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 b3babec..38fce33 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/init.yml
@@ -131,7 +131,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/system

diff --git a/classes/system b/classes/system
index 0a17807..35a3304 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e
+Subproject commit 35a330487e3fa722a7ed8dc6d968c103e321eec7