summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Copeland <ben.copeland@linaro.org>2017-12-05 16:22:49 +0000
committerBenjamin Copeland <ben.copeland@linaro.org>2017-12-05 16:30:40 +0000
commit8a82d3a452bc41946e0b7b54663d25d0e1b8efb1 (patch)
tree09c166166be2c537bd3487046dc27cc194f09d18
parentaf1ecc35fa5f5f5324e0fdbdff5da5dc2c8a00c0 (diff)
downloadansible-playbooks-8a82d3a452bc41946e0b7b54663d25d0e1b8efb1.tar.gz
Jenkins: No longer underscore _ as this breaks Ansible in certian situations
Change-Id: I9d5acc69a4090bbd88d422cc76e5aba5e4754e9c Reviewed-on: https://review.linaro.org/22831 Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>
-rw-r--r--group_vars/jenkins_master (renamed from group_vars/jenkins-master)0
-rw-r--r--group_vars/jenkins_slaves (renamed from group_vars/jenkins-slaves)0
-rw-r--r--hosts4
-rw-r--r--jenkins-master.yml2
-rw-r--r--jenkins-slaves.yml4
-rw-r--r--roles/ssh-ldap/templates/sshd_config2
6 files changed, 6 insertions, 6 deletions
diff --git a/group_vars/jenkins-master b/group_vars/jenkins_master
index 3027bcc..3027bcc 100644
--- a/group_vars/jenkins-master
+++ b/group_vars/jenkins_master
diff --git a/group_vars/jenkins-slaves b/group_vars/jenkins_slaves
index ab4d804..ab4d804 100644
--- a/group_vars/jenkins-slaves
+++ b/group_vars/jenkins_slaves
diff --git a/hosts b/hosts
index 19ab5e6..107568f 100644
--- a/hosts
+++ b/hosts
@@ -52,10 +52,10 @@ elk.linaro.org
[elk_warm]
elk.linaro.org
-[jenkins-master]
+[jenkins_master]
ci.linaro.org
-[jenkins-slaves]
+[jenkins_slaves]
144.76.6.139 # aosp-x86_64-07
188.40.51.209 # aosp-x86_64-08
213.133.116.86 # aosp-x86_64-09 (ART)
diff --git a/jenkins-master.yml b/jenkins-master.yml
index 345156d..00a7892 100644
--- a/jenkins-master.yml
+++ b/jenkins-master.yml
@@ -1,7 +1,7 @@
# Deploy jenkins-master
---
- name: Deploy jenkins
- hosts: jenkins-master
+ hosts: jenkins_master
become: yes
vars_files:
- "{{secrets_dir}}/host_vars/{{inventory_hostname}}"
diff --git a/jenkins-slaves.yml b/jenkins-slaves.yml
index c84962f..e02cd73 100644
--- a/jenkins-slaves.yml
+++ b/jenkins-slaves.yml
@@ -1,8 +1,8 @@
- name: Configure jenkins slaves
- hosts: jenkins-slaves
+ hosts: jenkins_slaves
become: yes
vars_files:
- - ["{{secrets_dir}}/group_vars/jenkins-slaves"]
+ - ["{{secrets_dir}}/group_vars/jenkins_slaves"]
roles:
- role: jenkins-slave-deps
- role: ssh-ldap
diff --git a/roles/ssh-ldap/templates/sshd_config b/roles/ssh-ldap/templates/sshd_config
index 09f5fb0..dd380a6 100644
--- a/roles/ssh-ldap/templates/sshd_config
+++ b/roles/ssh-ldap/templates/sshd_config
@@ -49,7 +49,7 @@ PermitEmptyPasswords no
# some PAM modules and threads)
ChallengeResponseAuthentication no
-{%if inventory_hostname not in groups['jenkins-slaves']%}
+{%if inventory_hostname not in groups['jenkins_slaves']%}
# Password prompt required for legacy buildslave user
PasswordAuthentication no
{%endif%}