x
/
fuel-plugin-elasticsearch-kibana
Code Issues Proposed changes

Enforce literal strings in Hiera YAML file 

Change-Id: I2c0729364fc131329dbc7479c30af41c8490e82c
Closes-Bug: #1631544
This commit is contained in:
Simon Pasquier 2017-01-10 09:44:44 +01:00
parent e6ee56cb59
commit 8c8606cf4f
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
deployment_scripts/puppet/manifests/hiera_override.pp
View File

@ -180,12 +180,14 @@ lma::kibana::nodes:
lma::kibana::tls:
enabled: <%= @tls_enabled %>
<% if @tls_enabled -%>
hostname: <%= @kibana_hostname %>
hostname: "<%= @kibana_hostname %>"
cert_file_path: <%= @cert_file_path %>
<% end -%>
lma::kibana::authnz:
username: <%= @elasticsearch_kibana["kibana_username"] %>
password: <%= @elasticsearch_kibana["kibana_password"] %>
username: >-
<%= @elasticsearch_kibana["kibana_username"] %>
password: >-
<%= @elasticsearch_kibana["kibana_password"] %>
ldap_enabled: <%= @ldap_enabled %>
ldap_authorization_enabled: <%= @ldap_authorization_enabled %>
<% if @ldap_enabled -%>
@ -195,15 +197,22 @@ lma::kibana::authnz:
<% end -%>
ldap_protocol: <%= @ldap_protocol %>
ldap_port: <%= @ldap_port %>
ldap_bind_dn: <%= @ldap_bind_dn %>
ldap_bind_password: <%= @ldap_bind_password %>
ldap_user_search_base_dns: <%= @ldap_user_search_base_dns %>
ldap_bind_dn: >-
<%= @ldap_bind_dn %>
ldap_bind_password: >-
<%= @ldap_bind_password %>
ldap_user_search_base_dns: >-
<%= @ldap_user_search_base_dns %>
ldap_user_attribute: <%= @ldap_user_attribute %>
ldap_user_search_filter: <%= @ldap_user_search_filter %>
ldap_group_attribute: <%= @ldap_group_attribute %>
ldap_user_search_filter: >-
<%= @ldap_user_search_filter %>
ldap_group_attribute: >-
<%= @ldap_group_attribute %>
<% if @ldap_authorization_enabled -%>
ldap_admin_group_dn: <%= @ldap_admin_group_dn %>
ldap_viewer_group_dn: <%= @ldap_viewer_group_dn %>
ldap_admin_group_dn: >-
<%= @ldap_admin_group_dn %>
ldap_viewer_group_dn: >-
<%= @ldap_viewer_group_dn %>
<% end -%>
<% end -%>
')