diff --git a/inventory/host_vars/jenkins.fedorainfracloud.org b/inventory/host_vars/jenkins.fedorainfracloud.org index 8d3f4d4fee..43831bff31 100644 --- a/inventory/host_vars/jenkins.fedorainfracloud.org +++ b/inventory/host_vars/jenkins.fedorainfracloud.org @@ -17,3 +17,4 @@ cloud_networks: # persistent-net - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" +jenkins_master: True diff --git a/playbooks/groups/jenkins-dev.yml b/playbooks/groups/jenkins-dev.yml index 8743f9708a..d41b7a549e 100644 --- a/playbooks/groups/jenkins-dev.yml +++ b/playbooks/groups/jenkins-dev.yml @@ -24,3 +24,15 @@ - include: "{{ tasks }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) shell: "hostname {{inventory_hostname}}" + +- name: provision instance + hosts: jenkins-dev + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "/srv/private/ansible/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + roles: + - base + - { role: jenkins/master, when: jenkins_master is defined } + - { role: jenkins/slave, when: jenkins_master is not defined } diff --git a/roles/jenkins/master/tasks/main.yml b/roles/jenkins/master/tasks/main.yml new file mode 100644 index 0000000000..a5a9c74064 --- /dev/null +++ b/roles/jenkins/master/tasks/main.yml @@ -0,0 +1,7 @@ +- name: install packages + dnf: name={{ item }} state=installed + with_items: + - jenkins + tags: + - jenkins/master + - packages diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml new file mode 100644 index 0000000000..73fbade17a --- /dev/null +++ b/roles/jenkins/slave/tasks/main.yml @@ -0,0 +1,7 @@ +- name: install packages + yum: name={{ item }} state=installed + with_items: + - java-1.8.0-openjdk-devel + tags: + - jenkins/slave + - packages