summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--elk.yml1
-rw-r--r--host_vars/elk.linaro.org9
-rw-r--r--roles/ssh-ldap/tasks/main.yml1
3 files changed, 10 insertions, 1 deletions
diff --git a/elk.yml b/elk.yml
index 2f8c4b1..733eed1 100644
--- a/elk.yml
+++ b/elk.yml
@@ -15,6 +15,7 @@
- hosts: elk_master
become: yes
roles:
+ - { role: ssh-ldap, tags: [ssh-ldap] }
- { role: elasticsearch-deps, tags: [curator] }
- { role: logstash, logstash_version: "1:2.4.0-1", tags: [logstash] }
- { role: kibana, kibana_version: "4.6.0", tags: [kibana, apache] }
diff --git a/host_vars/elk.linaro.org b/host_vars/elk.linaro.org
index ceb25a9..1018864 100644
--- a/host_vars/elk.linaro.org
+++ b/host_vars/elk.linaro.org
@@ -1,4 +1,11 @@
-# SSL
+ldap_cache_url: ""
+
+login_groups:
+ - systems
+
+ldap_base: dc=linaro,dc=org
+ldap_uri: "ldaps://login.linaro.org"
+ldap_binddn: cn=ldapbind,dc=linaro,dc=org
ssl_cert: /etc/ssl/certs/wildcard.linaro.org.crt
ssl_key: /etc/ssl/private/wildcard.linaro.org.key
diff --git a/roles/ssh-ldap/tasks/main.yml b/roles/ssh-ldap/tasks/main.yml
index 819fe69..528bf78 100644
--- a/roles/ssh-ldap/tasks/main.yml
+++ b/roles/ssh-ldap/tasks/main.yml
@@ -6,6 +6,7 @@
- libpam-ccreds
- nss-updatedb
- python-ldap
+ - git
- name: Install linaro-git-tools to provide linaro_ldap.py
git: repo="https://git.linaro.org/infrastructure/linaro-git-tools.git/"