From d7a4360c7fec1ad4bf771ab12fb0eb77a059c444 Mon Sep 17 00:00:00 2001
From: Guillaume Thouvenin <gthouvenin@mirantis.com>
Date: Tue, 9 Aug 2016 11:59:41 +0200
Subject: [PATCH] Fix issue with LDAP protocol radio button

This patch modifies the label of the radio button used for selecting
the LDAP protocol to make it unique across all the StackLight plugins.

Change-Id: I3e2de2c59bc46594293cfd902098b9ae7292869b
Partial-Bug: #1599778
(cherry picked from commit 459a7f272390f48114cc03377ce98add1154371c)
---
 deployment_scripts/puppet/manifests/hiera_override.pp | 2 +-
 environment_config.yaml                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/hiera_override.pp b/deployment_scripts/puppet/manifests/hiera_override.pp
index ed97308..1d762e0 100644
--- a/deployment_scripts/puppet/manifests/hiera_override.pp
+++ b/deployment_scripts/puppet/manifests/hiera_override.pp
@@ -100,7 +100,7 @@ if $tls_enabled {
 }
 
 $ldap_enabled = $elasticsearch_kibana['ldap_enabled'] or false
-$ldap_protocol              = $elasticsearch_kibana['ldap_protocol']
+$ldap_protocol              = $elasticsearch_kibana['ldap_protocol_for_kibana']
 $ldap_servers               = split($elasticsearch_kibana['ldap_servers'], '\s+')
 $ldap_bind_dn               = $elasticsearch_kibana['ldap_bind_dn']
 $ldap_bind_password         = $elasticsearch_kibana['ldap_bind_password']
diff --git a/environment_config.yaml b/environment_config.yaml
index 43ef253..686eafe 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -148,7 +148,7 @@ attributes:
     weight: 100
     type: "checkbox"
 
-  ldap_protocol:
+  ldap_protocol_for_kibana:
     type: "radio"
     value: 'ldap'
     weight: 110