summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Pasquier <spasquier@mirantis.com>2017-01-10 09:44:44 +0100
committerSimon Pasquier <spasquier@mirantis.com>2017-01-10 09:44:44 +0100
commit8c8606cf4f87eba9fe9016afad4a0f867b657f0b (patch)
treed1726498f0926e8c646a6dc5badca135a41ac278
parente6ee56cb59cc806f06bbce4eb1dff0849e61e690 (diff)
Enforce literal strings in Hiera YAML file
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Code-Review-1: Guillaume Thouvenin <gthouvenin@mirantis.com> Workflow+1: Simon Pasquier <spasquier@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 11 Jan 2017 09:48:49 +0000 Reviewed-on: https://review.openstack.org/418257 Project: openstack/fuel-plugin-elasticsearch-kibana Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/hiera_override.pp29
1 files changed, 19 insertions, 10 deletions
diff --git a/deployment_scripts/puppet/manifests/hiera_override.pp b/deployment_scripts/puppet/manifests/hiera_override.pp
index 1b488a0..9f000b1 100644
--- a/deployment_scripts/puppet/manifests/hiera_override.pp
+++ b/deployment_scripts/puppet/manifests/hiera_override.pp
@@ -180,12 +180,14 @@ lma::kibana::nodes:
180lma::kibana::tls: 180lma::kibana::tls:
181 enabled: <%= @tls_enabled %> 181 enabled: <%= @tls_enabled %>
182<% if @tls_enabled -%> 182<% if @tls_enabled -%>
183 hostname: <%= @kibana_hostname %> 183 hostname: "<%= @kibana_hostname %>"
184 cert_file_path: <%= @cert_file_path %> 184 cert_file_path: <%= @cert_file_path %>
185<% end -%> 185<% end -%>
186lma::kibana::authnz: 186lma::kibana::authnz:
187 username: <%= @elasticsearch_kibana["kibana_username"] %> 187 username: >-
188 password: <%= @elasticsearch_kibana["kibana_password"] %> 188 <%= @elasticsearch_kibana["kibana_username"] %>
189 password: >-
190 <%= @elasticsearch_kibana["kibana_password"] %>
189 ldap_enabled: <%= @ldap_enabled %> 191 ldap_enabled: <%= @ldap_enabled %>
190 ldap_authorization_enabled: <%= @ldap_authorization_enabled %> 192 ldap_authorization_enabled: <%= @ldap_authorization_enabled %>
191<% if @ldap_enabled -%> 193<% if @ldap_enabled -%>
@@ -195,15 +197,22 @@ lma::kibana::authnz:
195<% end -%> 197<% end -%>
196 ldap_protocol: <%= @ldap_protocol %> 198 ldap_protocol: <%= @ldap_protocol %>
197 ldap_port: <%= @ldap_port %> 199 ldap_port: <%= @ldap_port %>
198 ldap_bind_dn: <%= @ldap_bind_dn %> 200 ldap_bind_dn: >-
199 ldap_bind_password: <%= @ldap_bind_password %> 201 <%= @ldap_bind_dn %>
200 ldap_user_search_base_dns: <%= @ldap_user_search_base_dns %> 202 ldap_bind_password: >-
203 <%= @ldap_bind_password %>
204 ldap_user_search_base_dns: >-
205 <%= @ldap_user_search_base_dns %>
201 ldap_user_attribute: <%= @ldap_user_attribute %> 206 ldap_user_attribute: <%= @ldap_user_attribute %>
202 ldap_user_search_filter: <%= @ldap_user_search_filter %> 207 ldap_user_search_filter: >-
203 ldap_group_attribute: <%= @ldap_group_attribute %> 208 <%= @ldap_user_search_filter %>
209 ldap_group_attribute: >-
210 <%= @ldap_group_attribute %>
204<% if @ldap_authorization_enabled -%> 211<% if @ldap_authorization_enabled -%>
205 ldap_admin_group_dn: <%= @ldap_admin_group_dn %> 212 ldap_admin_group_dn: >-
206 ldap_viewer_group_dn: <%= @ldap_viewer_group_dn %> 213 <%= @ldap_admin_group_dn %>
214 ldap_viewer_group_dn: >-
215 <%= @ldap_viewer_group_dn %>
207<% end -%> 216<% end -%>
208<% end -%> 217<% end -%>
209') 218')