From 8568cf1f38e330c1fdb43c136b355f836f54a06c Mon Sep 17 00:00:00 2001 From: Alexey Khivin Date: Sat, 25 Jun 2016 19:59:17 +0300 Subject: [PATCH] [OpenLDAP] Calls of setHieraValue replaced with putHieraData Several seconds saved and looks better. Change-Id: Icd774310caf7d80b9aed3a18f9aec3eb445fe387 --- .../OpenLDAP/package/Classes/OpenLDAP.yaml | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml b/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml index 23feca2..fb6594e 100644 --- a/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml +++ b/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml @@ -75,28 +75,30 @@ Methods: createConfiguration: Body: - - $.instance.setHieraValue('ldap_domain', $.domain) - - $.instance.setHieraValue('ldap_dc', $.domain.split('.')[0]) - - $.instance.setHieraValue('ldap_root_user', $.ldapRootUser) - - $.instance.setHieraValue('ldap_root_password', $.ldapRootPass) - - $.instance.setHieraValue('ldap_user', $.ldapUser) - - $.instance.setHieraValue('ldap_password', $.ldapPass) + - $data: dict( + 'ldap_domain' => $.domain, + 'ldap_dc' => $.domain.split('.')[0], + 'ldap_root_user' => $.ldapRootUser, + 'ldap_root_password' => $.ldapRootPass, + 'ldap_user' => $.ldapUser, + 'ldap_password' => $.ldapPass, + 'ldap::client::uri' => 'localhost', + 'ldap::server::rootpw' => $.ldapRootPass, + 'ldap::client::ssl_cert' => '') - - !yaql "$.instance.setHieraValue('ldap::client::uri', 'localhost')" - - !yaql "$.instance.setHieraValue('ldap::server::rootpw', $.ldapRootPass)" - - !yaql "$.instance.setHieraValue('ldap::client::ssl_cert', '')" + - $this.instance.putHieraData($data) # # these values are also supported by puppet module # - #- !yaql "$.instance.setHieraValue('ldap::client::base', 'dc=example,dc=com')" - #- !yaql "$.instance.setHieraValue('ldap::client::ssl', 'false')" - #- !yaql "$.instance.setHieraValue('ldap::server::suffix', 'dc=example,dc=com')" - #- !yaql "$.instance.setHieraValue('ldap::server::rootdn', format('cn={0},dc=example,dc=com', $.ldapRootUser))" - #- !yaql "$.instance.setHieraValue('ldap::server::ssl', false)" - #- !yaql "$.instance.setHieraValue('ldap::server::ssl_cacert', '')" - #- !yaql "$.instance.setHieraValue('ldap::server::ssl_cert', '')" - #- !yaql "$.instance.setHieraValue('ldap::server::ssl_key', '')" + # 'ldap::client::base', 'dc=example,dc=com' + # 'ldap::client::ssl', 'false' + # 'ldap::server::suffix', 'dc=example,dc=com' + # 'ldap::server::rootdn', format('cn={0},dc=example,dc=com', $.ldapRootUser) + # 'ldap::server::ssl', false + # 'ldap::server::ssl_cacert', '' + # 'ldap::server::ssl_cert', '' + # 'ldap::server::ssl_key', '' configureOpenLDAPRootUser: Body: