From 20aa34b663f53dba080a94be37d24df0e7416f93 Mon Sep 17 00:00:00 2001 From: Alexey Khivin Date: Sat, 25 Jun 2016 19:24:37 +0300 Subject: [PATCH] [Gerrit] Calls of setHieraValue replaced to putHieraData Several seconds saved and looks better. createLdapConfiguration renamed to use it like a private method only Change-Id: Ia715e4dfd6f3f6fc785474ac070c3168b174909f --- .../Gerrit/package/Classes/Gerrit.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml index f5e4cf9..12cc074 100644 --- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml +++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml @@ -105,7 +105,7 @@ Methods: Body: - $.instance.setHieraValue( 'project_config_repo', $.getProjectConfigRepo()) - createLdapConfiguration: + _createLdapConfiguration: Body: - $ldapInstance: $.ldap.instance - If: $ldapInstance.assignFloatingIp @@ -114,18 +114,21 @@ Methods: Else: - $ldapHost: $ldapInstance.ipAddresses[0] - - $.instance.setHieraValue('ldap_ip', $ldapHost) - - $.instance.setHieraValue('ldap_domain', $.ldap.domain) - - $.instance.setHieraValue('ldap_root_user', $.ldap.ldapRootUser) - - $.instance.setHieraValue('ldap_root_password', $.ldap.ldapRootPass) - - $.instance.setHieraValue('ldap_user', $.ldap.ldapUser) - - $.instance.setHieraValue('ldap_password', $.ldap.ldapPass) + - $data: + ldap_ip: $ldapHost + ldap_domain: $.ldap.domain + ldap_root_user: $.ldap.ldapRootUser + ldap_root_password: $.ldap.ldapRootPass + ldap_user: $.ldap.ldapUser + ldap_password: $.ldap.ldapPass + + - $this.instance.putHieraData($data) createConfiguration: Body: - If: $this.ldap != null Then: - - $.createLdapConfiguration() + - $._createLdapConfiguration() - $data: gerrit_war_url: $this.warUrl