commit 704132ffe9a045ffd15351b8d598e30095450d28 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Mon Sep 11 12:26:38 2017 +0200 Update infra-tags repos files/common/fedora-infra-tags-stg.repo | 6 ++++ files/common/fedora-infra-tags.repo | 6 ++++ files/common/rhel-infra-tags-stg.repo | 6 ++++ files/common/rhel-infra-tags.repo | 6 ++++ tasks/yumrepos.yml | 39 +++++++++++++++++++++++++++++- 5 files changed, 61 insertions(+), 2 deletions(-) --- diff --git a/files/common/fedora-infra-tags-stg.repo b/files/common/fedora-infra-tags-stg.repo new file mode 100644 index 0000000..1a4b0d8 --- /dev/null +++ b/files/common/fedora-infra-tags-stg.repo @@ -0,0 +1,6 @@ +[infrastructure-tags-stg] +name=Fedora Infrastructure staging tag $releasever - $basearch +baseurl=https://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra-stg/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS diff --git a/files/common/fedora-infra-tags.repo b/files/common/fedora-infra-tags.repo new file mode 100644 index 0000000..1ed309c --- /dev/null +++ b/files/common/fedora-infra-tags.repo @@ -0,0 +1,6 @@ +[infrastructure-tags] +name=Fedora Infrastructure tag $releasever - $basearch +baseurl=https://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS diff --git a/files/common/rhel-infra-tags-stg.repo b/files/common/rhel-infra-tags-stg.repo new file mode 100644 index 0000000..4f6de9e --- /dev/null +++ b/files/common/rhel-infra-tags-stg.repo @@ -0,0 +1,6 @@ +[infrastructure-tags-stg] +name=Fedora Infrastructure tag $releasever - $basearch +baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra-stg/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS diff --git a/files/common/rhel-infra-tags.repo b/files/common/rhel-infra-tags.repo new file mode 100644 index 0000000..ece3b4f --- /dev/null +++ b/files/common/rhel-infra-tags.repo @@ -0,0 +1,6 @@ +[infrastructure-tags] +name=Fedora Infrastructure tag $releasever - $basearch +baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index 5960ecb..5ae06a5 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -1,8 +1,43 @@ --- +- name: add infrastructure tags repo - RHEL + copy: src="{{ files }}/common/rhel-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" + when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') + tags: + - config + - packages + - yumrepos + +- name: add infrastructure STAGING tags repo - RHEL + copy: src="{{ files }}/common/rhel-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo" + when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and env == 'staging' + tags: + - config + - packages + - yumrepos + +- name: add infrastructure tags repo - Fedora + copy: src="{{ files }}/common/fedora-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" + when: ansible_distribution == 'Fedora' + tags: + - config + - packages + - yumrepos + +- name: add infrastructure STAGING tags repo - Fedora + copy: src="{{ files }}/common/fedora-infra-tags-stg.repo" dest="/etc/yum.repos.d/infra-tags-stg.repo" + when: ansible_distribution == 'Fedora' and env == 'staging' + tags: + - config + - packages + - yumrepos -- name: add infrastructure repo - copy: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}" +- name: Make sure older infrastructure tags repos no longer exist + file: path="/etc/yum.repos.d/{{item}}" state=absent with_items: + - fedora-infra-tags.repo + - fedora-infra-tags-stg.repo + - rhel-infra-tags.repo + - rhel-infra-tags-stg.repo - infrastructure.repo - infrastructure-testing.repo tags: