From e02a272b9dd47c22fb1b61652780bba4e7badbb5 Mon Sep 17 00:00:00 2001
From: Guillaume Thouvenin <gthouvenin@mirantis.com>
Date: Tue, 9 Aug 2016 11:51:40 +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: I9fff175af82a5e6bab8666fa5f8c8f1b64926b0c
Partial-Bug: #1599778
(cherry picked from commit 57e43e3a0a64b6e805169ead4493aafee285871b)
---
 deployment_scripts/puppet/manifests/hiera.pp | 2 +-
 environment_config.yaml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/hiera.pp b/deployment_scripts/puppet/manifests/hiera.pp
index 7b0ef20..f365297 100644
--- a/deployment_scripts/puppet/manifests/hiera.pp
+++ b/deployment_scripts/puppet/manifests/hiera.pp
@@ -71,7 +71,7 @@ $influxdb_port = hiera('lma::influxdb::influxdb_port', 8086)
 $password = $plugin['nagios_password']
 
 $ldap_enabled               = $plugin['ldap_enabled'] or false
-$ldap_protocol              = $plugin['ldap_protocol']
+$ldap_protocol              = $plugin['ldap_protocol_for_nagios']
 $ldap_servers               = split($plugin['ldap_servers'], '\s+')
 $ldap_bind_dn               = $plugin['ldap_bind_dn']
 $ldap_bind_password         = $plugin['ldap_bind_password']
diff --git a/environment_config.yaml b/environment_config.yaml
index f4fd05b..27eaf5a 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -137,7 +137,7 @@ attributes:
     weight: 100
     type: "checkbox"
 
-  ldap_protocol:
+  ldap_protocol_for_nagios:
     type: "radio"
     value: 'ldap'
     weight: 110