Browse Source

Enforce literal strings in Hiera YAML file

Change-Id: I2c0729364fc131329dbc7479c30af41c8490e82c
Closes-Bug: #1631544
Simon Pasquier 2 years ago
parent
commit
8c8606cf4f
1 changed files with 19 additions and 10 deletions
  1. 19
    10
      deployment_scripts/puppet/manifests/hiera_override.pp

+ 19
- 10
deployment_scripts/puppet/manifests/hiera_override.pp View File

@@ -180,12 +180,14 @@ lma::kibana::nodes:
180 180
 lma::kibana::tls:
181 181
     enabled: <%= @tls_enabled %>
182 182
 <% if @tls_enabled -%>
183
-    hostname: <%= @kibana_hostname %>
183
+    hostname: "<%= @kibana_hostname %>"
184 184
     cert_file_path: <%= @cert_file_path %>
185 185
 <% end -%>
186 186
 lma::kibana::authnz:
187
-    username: <%= @elasticsearch_kibana["kibana_username"] %>
188
-    password: <%= @elasticsearch_kibana["kibana_password"] %>
187
+    username: >-
188
+      <%= @elasticsearch_kibana["kibana_username"] %>
189
+    password: >-
190
+      <%= @elasticsearch_kibana["kibana_password"] %>
189 191
     ldap_enabled: <%= @ldap_enabled %>
190 192
     ldap_authorization_enabled: <%= @ldap_authorization_enabled %>
191 193
 <% if @ldap_enabled -%>
@@ -195,15 +197,22 @@ lma::kibana::authnz:
195 197
 <% end -%>
196 198
     ldap_protocol: <%= @ldap_protocol %>
197 199
     ldap_port: <%= @ldap_port %>
198
-    ldap_bind_dn: <%= @ldap_bind_dn %>
199
-    ldap_bind_password: <%= @ldap_bind_password %>
200
-    ldap_user_search_base_dns: <%= @ldap_user_search_base_dns %>
200
+    ldap_bind_dn: >-
201
+      <%= @ldap_bind_dn %>
202
+    ldap_bind_password: >-
203
+      <%= @ldap_bind_password %>
204
+    ldap_user_search_base_dns: >-
205
+      <%= @ldap_user_search_base_dns %>
201 206
     ldap_user_attribute: <%= @ldap_user_attribute %>
202
-    ldap_user_search_filter: <%= @ldap_user_search_filter %>
203
-    ldap_group_attribute: <%= @ldap_group_attribute %>
207
+    ldap_user_search_filter: >-
208
+      <%= @ldap_user_search_filter %>
209
+    ldap_group_attribute: >-
210
+      <%= @ldap_group_attribute %>
204 211
 <% if @ldap_authorization_enabled -%>
205
-    ldap_admin_group_dn: <%= @ldap_admin_group_dn %>
206
-    ldap_viewer_group_dn: <%= @ldap_viewer_group_dn %>
212
+    ldap_admin_group_dn: >-
213
+      <%= @ldap_admin_group_dn %>
214
+    ldap_viewer_group_dn: >-
215
+      <%= @ldap_viewer_group_dn %>
207 216
 <% end -%>
208 217
 <% end -%>
209 218
 ')

Loading…
Cancel
Save