Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to specify login/password for the Jenkins master #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Role Variables

# Jenkins node vars
jenkins_master_url: https://jenkins.mycompany.com/
jenkins_master_username: admin
jenkins_master_password: a63729ab56c0bcba03da92f2a6425c5a
jenkins_node_executors: 2
jenkins_node_host: jenkins-node-1.lan.mycompany.net (default: {{ ansible_eth0.ipv4.address }})
jenkins_node_port: 22
Expand Down
2 changes: 2 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ jenkins_username: jenkins

# Jenkins node vars
jenkins_master_url: null
jenkins_master_username: ~
jenkins_master_password: ~
jenkins_node_credentials_id: null
jenkins_node_executors: 2
jenkins_node_host: null
Expand Down
12 changes: 12 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,17 @@
user: '{{ jenkins_username }}'
key: '{{ jenkins_authorized_key }}'

- name: Ensure jenkins home belongs to the user
file:
path: '{{ jenkins_home }}'
owner: '{{ jenkins_username}}'
recurse: yes

- name: Check previous node
jenkins_api:
jenkins_url: '{{ jenkins_master_url }}'
jenkins_username: '{{ jenkins_master_username }}'
jenkins_password: '{{ jenkins_master_password }}'
command: node_exists
args:
- '{{ jenkins_node_name or ansible_hostname }}'
Expand All @@ -52,6 +60,8 @@
- name: Delete previous node
jenkins_api:
jenkins_url: '{{ jenkins_master_url }}'
jenkins_username: '{{ jenkins_master_username }}'
jenkins_password: '{{ jenkins_master_password }}'
command: delete_node
args:
- '{{ jenkins_node_name or ansible_hostname }}'
Expand All @@ -62,6 +72,8 @@
- name: Create jenkins node
jenkins_api:
jenkins_url: '{{ jenkins_master_url }}'
jenkins_username: '{{ jenkins_master_username }}'
jenkins_password: '{{ jenkins_master_password }}'
command: create_node
args:
- '{{ jenkins_node_name or ansible_hostname }}'
Expand Down