From 682a04b2929d35dec5058795c88e4267012d0fed Mon Sep 17 00:00:00 2001 From: Till Maas Date: Fri, 30 May 2014 17:27:33 +0200 Subject: [PATCH] Add autosigner role - Move builder infrastructure repo to own role - Add initial tasks to autosigner role --- playbooks/groups/autosign.yml | 1 + roles/autosigner/meta/main.yml | 3 +++ roles/autosigner/tasks/main.yml | 4 ++++ .../files/builder-infrastructure.repo | 0 roles/builder_repo/tasks/main.yml | 2 ++ roles/koji_builder/meta/main.yml | 3 +++ roles/koji_builder/tasks/main.yml | 3 --- 7 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 roles/autosigner/meta/main.yml create mode 100644 roles/autosigner/tasks/main.yml rename roles/{koji_builder => builder_repo}/files/builder-infrastructure.repo (100%) create mode 100644 roles/builder_repo/tasks/main.yml create mode 100644 roles/koji_builder/meta/main.yml diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index d8c13f58f0..1c2e8f4800 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -38,6 +38,7 @@ - nagios_client - fas_client - collectd/base + - autosigner tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/roles/autosigner/meta/main.yml b/roles/autosigner/meta/main.yml new file mode 100644 index 0000000000..dd51899ab5 --- /dev/null +++ b/roles/autosigner/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: builder_repo } diff --git a/roles/autosigner/tasks/main.yml b/roles/autosigner/tasks/main.yml new file mode 100644 index 0000000000..552e1a3407 --- /dev/null +++ b/roles/autosigner/tasks/main.yml @@ -0,0 +1,4 @@ +- name: add pkgs + yum: state=latest pkg={{ item }} + with_items: + - sigul diff --git a/roles/koji_builder/files/builder-infrastructure.repo b/roles/builder_repo/files/builder-infrastructure.repo similarity index 100% rename from roles/koji_builder/files/builder-infrastructure.repo rename to roles/builder_repo/files/builder-infrastructure.repo diff --git a/roles/builder_repo/tasks/main.yml b/roles/builder_repo/tasks/main.yml new file mode 100644 index 0000000000..330a5615e5 --- /dev/null +++ b/roles/builder_repo/tasks/main.yml @@ -0,0 +1,2 @@ +- name: add builder infra yum repo + copy: src=builder-infrastructure.repo dest=/etc/yum.repos.d/builder-infrastructure.repo diff --git a/roles/koji_builder/meta/main.yml b/roles/koji_builder/meta/main.yml new file mode 100644 index 0000000000..dd51899ab5 --- /dev/null +++ b/roles/koji_builder/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: builder_repo } diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index 4299a32d4c..e9ba5963f1 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -36,9 +36,6 @@ - /pub/fedora - /pub/epel -- name: add builder infra yum repo - copy: src=builder-infrastructure.repo dest=/etc/yum.repos.d/builder-infrastructure.repo - - name: add pkgs yum: state=installed pkg={{ item }} with_items: