summaryrefslogtreecommitdiffstats
path: root/roles/taskotron/buildslave
diff options
context:
space:
mode:
authorTim Flink <tflink@fedoraproject.org>2016-01-21 01:05:01 +0000
committerTim Flink <tflink@fedoraproject.org>2016-01-21 01:05:01 +0000
commitbf0ce486f2b72eb251a13735febf26bab90ff2f4 (patch)
tree69c0e8721afd5c2ac44127bf157343343cb57c98 /roles/taskotron/buildslave
parente84ba06bf8a67f0623468298ba60bd13912e852e (diff)
downloadansible-bf0ce486f2b72eb251a13735febf26bab90ff2f4.tar.gz
ansible-bf0ce486f2b72eb251a13735febf26bab90ff2f4.tar.xz
ansible-bf0ce486f2b72eb251a13735febf26bab90ff2f4.zip
changing taskotron buildslave config around so stg can do disposable clients
Diffstat (limited to 'roles/taskotron/buildslave')
-rw-r--r--roles/taskotron/buildslave/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml
index 5eef01f6d..9d388a701 100644
--- a/roles/taskotron/buildslave/tasks/main.yml
+++ b/roles/taskotron/buildslave/tasks/main.yml
@@ -26,11 +26,11 @@
- python-fedora
- python-doit
- python-rpmfluff
- when: deployment_type in ['qa-stg'] and ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
+ when: (deployment_type in ['qa-stg']) and (ansible_distribution_major_version|int > 21) and (ansible_cmdline.ostree is not defined)
- name: add the buildslave user for taskotron
user: name=buildslave
- when: deployment_type in ['prod', 'stg', 'local']
+ when: deployment_type in ['prod', 'local']
- name: add the buildslave user for ci
user: name=buildslave groups=mock
@@ -38,9 +38,9 @@
- name: add buildslaves group
group: name={{ slaves_group }}
- when: deployment_type == 'dev'
+ when: deployment_type in ['dev', 'stg']
- name: add buildslave users
user: name={{ item.user }} group={{ slaves_group }} groups=testcloud home={{ item.home }}
with_items: slaves
- when: deployment_type == 'dev'
+ when: deployment_type in ['dev', 'stg']