x/ci-cd-pipeline-app-murano
Code Issues Proposed changes

Merge "[OpenLDAP] Calls of setHieraValue replaced with putHieraData"

Browse Source
This commit is contained in:
Jenkins 2016-07-04 06:56:53 +00:00 committed by Gerrit Code Review
commit 1db3f9f703
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml
View File

@ -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: