Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fixing buildslave conditionals to work with qa-stg

Browse source
This commit is contained in:
Tim Flink 2016-01-05 18:03:01 +00:00
parent 760c446c77
commit 14b8411b17
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roles/taskotron/buildslave-configure/tasks/main.yml
View file

@ -2,13 +2,14 @@
sudo: true sudo: true
sudo_user: "{{ slave_user }}" sudo_user: "{{ slave_user }}"
command: creates={{ slave_dir }} buildslave create-slave {{ slave_dir }} {{ buildmaster }} buildslave passwd command: creates={{ slave_dir }} buildslave create-slave {{ slave_dir }} {{ buildmaster }} buildslave passwd
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']
- name: generate slave config - name: generate slave config
sudo: true sudo: true
sudo_user: "{{ slave_user }}" sudo_user: "{{ slave_user }}"
template: src=buildbot.tac.j2 dest={{ slave_dir }}/buildbot.tac mode=0600 owner={{ slave_user }} group={{ slave_user }} template: src=buildbot.tac.j2 dest={{ slave_dir }}/buildbot.tac mode=0600 owner={{ slave_user }} group={{ slave_user }}
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']
#when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local'
- name: generate slave info - name: generate slave info
sudo: true sudo: true
@ -17,18 +18,19 @@
with_items: with_items:
- admin - admin
- host - host
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']
- name: create slave ssh directory - name: create slave ssh directory
when: buildslave_public_sshkey_file is defined and (deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local') when: buildslave_public_sshkey_file is defined and (deployment_type in ['prod', 'stg', 'local', 'qa-stg'])
file: path={{ slave_home }}/.ssh owner={{ slave_user }} group={{ slave_user }} mode=0700 state=directory file: path={{ slave_home }}/.ssh owner={{ slave_user }} group={{ slave_user }} mode=0700 state=directory
#when: buildslave_public_sshkey_file is defined and (deployment_type in ['prod', 'stg', 'local', 'qa-stg'])
- name: install slave ssh private key - name: install slave ssh private key
when: buildslave_private_sshkey_file is defined and (deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local') when: buildslave_public_sshkey_file is defined and (deployment_type in ['prod', 'stg', 'local', 'qa-stg'])
copy: src={{ private }}/files/taskotron/{{ buildslave_private_sshkey_file }} dest={{ slave_home }}/.ssh/id_rsa owner={{ slave_user }} group={{ slave_user }} mode=0600 copy: src={{ private }}/files/taskotron/{{ buildslave_private_sshkey_file }} dest={{ slave_home }}/.ssh/id_rsa owner={{ slave_user }} group={{ slave_user }} mode=0600
- name: install slave ssh public key - name: install slave ssh public key
when: buildslave_public_sshkey_file is defined and (deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local') when: buildslave_public_sshkey_file is defined and (deployment_type in ['prod', 'stg', 'local', 'qa-stg'])
copy: src={{ private }}/files/taskotron/{{ buildslave_public_sshkey_file }} dest={{ slave_home }}/.ssh/id_rsa.pub owner={{ slave_user }} group={{ slave_user }} mode=0644 copy: src={{ private }}/files/taskotron/{{ buildslave_public_sshkey_file }} dest={{ slave_home }}/.ssh/id_rsa.pub owner={{ slave_user }} group={{ slave_user }} mode=0644
- name: make sure master is in known_hosts - name: make sure master is in known_hosts
@ -37,11 +39,11 @@
- name: generate buildslave service file - name: generate buildslave service file
template: src=buildslave.service.j2 dest=/lib/systemd/system/buildslave.service owner=root group=root mode=0744 template: src=buildslave.service.j2 dest=/lib/systemd/system/buildslave.service owner=root group=root mode=0744
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']
- name: start and enable buildslave service - name: start and enable buildslave service
service: name=buildslave enabled=yes state=started service: name=buildslave enabled=yes state=started
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']
- name: create slave - name: create slave

6
roles/taskotron/buildslave/tasks/main.yml
View file

@ -1,6 +1,6 @@
--- ---
- name: ensure packages required for buildslave are installed (yum) - name: ensure packages required for buildslave are installed (yum)
yum: name={{ item }} state=present enablerepo={{ extra_enablerepos }} yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
with_items: with_items:
- buildbot-slave - buildbot-slave
- git - git
@ -17,7 +17,7 @@
when: ansible_distribution_major_version|int < 22 when: ansible_distribution_major_version|int < 22
- name: ensure packages required for buildslave are installed (dnf) - name: ensure packages required for buildslave are installed (dnf)
dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
with_items: with_items:
- buildbot-slave - buildbot-slave
- git - git
@ -35,7 +35,7 @@
- name: add the buildslave user - name: add the buildslave user
user: name=buildslave user: name=buildslave
when: deployment_type == 'prod' or deployment_type == 'stg' or deployment_type == 'local' when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']
- name: add buildslaves group - name: add buildslaves group
group: name={{ slaves_group }} group: name={{ slaves_group }}