[whimsy] branch master updated: No longer needed

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 79c64da  No longer needed
79c64da is described below

commit 79c64daa6463f29f1bf41825f356444098675416
Author: Sebb <se...@apache.org>
AuthorDate: Thu Dec 12 23:04:00 2019 +0000

    No longer needed
---
 lib/whimsy/asf/ldap.rb        |  8 --------
 www/status/monitors/system.rb | 14 --------------
 2 files changed, 22 deletions(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 9747751..3151574 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -77,14 +77,6 @@ module ASF
       puppet_config['ldapclient::ldapcert']
     end
 
-    # extract the ldap servers from the puppet configuration
-    def self.puppet_ldapservers
-      puppet_config['ldapserver::slapd_peers'].values.
-        map {|host| "ldaps://#{host}:636"}
-    rescue
-      []
-    end
-
     # connect to LDAP
     def self.connect(test = true, hosts = nil)
       hosts ||= self.hosts
diff --git a/www/status/monitors/system.rb b/www/status/monitors/system.rb
index fa3f335..1c5fe4a 100644
--- a/www/status/monitors/system.rb
+++ b/www/status/monitors/system.rb
@@ -54,20 +54,6 @@ def Monitor.system(previous_status)
   status[name] = {level: master == true ? 'success' : 'warning',
                   data: master.to_s}
 
-# No longer relevant as we use standard alias names
-#  # Is ASF::LDAP.hosts up to date?
-#  require_relative '../../../lib/whimsy/asf'
-#  name = :ldap
-#  pls = ASF::LDAP.puppet_ldapservers.sort
-#  hosts = ASF::LDAP::RO_HOSTS.sort
-#  diff = (pls-hosts).map {|host| "+ #{host}"}
-#  diff += (hosts-pls).map {|host| "- #{host}"}
-#  if diff.empty?
-#    status[name] = {level: 'success', data: hosts}
-#  else
-#    status[name] = {level: 'warning', data: diff}
-#  end
-
   {data: status}
 end