From a55b3899de2c2cb91d3e6e706c58dba9ca0e057b Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 20 Apr 2016 07:55:03 +0000 Subject: [PATCH] taskotron-dev: add namespaces.yaml --- inventory/group_vars/taskotron-dev-client-hosts | 2 ++ roles/taskotron/taskotron-client/tasks/main.yml | 4 ++++ .../taskotron-client/templates/namespaces.yaml.j2 | 10 ++++++++++ 3 files changed, 16 insertions(+) create mode 100644 roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron-dev-client-hosts index 2e35eba3e7..ae8ffb93c8 100644 --- a/inventory/group_vars/taskotron-dev-client-hosts +++ b/inventory/group_vars/taskotron-dev-client-hosts @@ -49,6 +49,8 @@ client_report_to_bodhi: 'False' imagesdir: /srv/diskimages +grokmirror_user: grokmirror + ############################################################ # testcloud config diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml index 4244bb2f34..aba71ceb17 100644 --- a/roles/taskotron/taskotron-client/tasks/main.yml +++ b/roles/taskotron/taskotron-client/tasks/main.yml @@ -36,6 +36,10 @@ - name: generate taskotron.yaml config file template: src=taskotron.yaml.j2 dest=/etc/taskotron/taskotron.yaml owner=root group=root mode=0644 +- name: generate namespaces.yaml config file + template: src=namespaces.yaml.j2 dest=/etc/taskotron/namespaces.yaml owner=root group=root mode=0644 + when: deployment_type == 'dev' + - name: generate testcloud config file when: deployment_type in ['dev', 'stg', 'prod'] template: src=settings.py.testcloud.j2 dest=/etc/testcloud/settings.py owner=root group=root mode=0644 diff --git a/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 b/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 new file mode 100644 index 0000000000..aed6737d51 --- /dev/null +++ b/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 @@ -0,0 +1,10 @@ +# A list of namespaces that any task is allowed to post a result into +namespaces_safe: + - scratch + +# A list of git repos that are allowed to post a result into a particular namespace +namespaces_whitelist: + qa: + - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/ + pkg: + - git://pkgs.fedoraproject.org/rpms-checks/