diff options
| author | Adam Miller <admiller@redhat.com> | 2016-02-08 14:19:24 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2016-02-08 14:19:24 +0000 |
| commit | 4070e24db7a2be72d6d6f98b2ce62746787576a0 (patch) | |
| tree | 1fbe09897b44d29514884904909ff963dc8e8841 | |
| parent | 67c1feaad082e92d1530922933b71447abbcfba5 (diff) | |
| parent | ea257d6818989b6e2ed04648676bf244c517a9b4 (diff) | |
| download | ansible-4070e24db7a2be72d6d6f98b2ce62746787576a0.tar.gz ansible-4070e24db7a2be72d6d6f98b2ce62746787576a0.tar.xz ansible-4070e24db7a2be72d6d6f98b2ce62746787576a0.zip | |
Merge branch 'master' of /git/ansible
* 'master' of /git/ansible:
Remove patternfly copr repo. This is in the infra repo now.
| -rw-r--r-- | roles/pdc/frontend/files/patternfly-patternfly1-epel-7.repo | 8 | ||||
| -rw-r--r-- | roles/pdc/frontend/tasks/main.yml | 17 |
2 files changed, 6 insertions, 19 deletions
diff --git a/roles/pdc/frontend/files/patternfly-patternfly1-epel-7.repo b/roles/pdc/frontend/files/patternfly-patternfly1-epel-7.repo deleted file mode 100644 index 160ef1b2d..000000000 --- a/roles/pdc/frontend/files/patternfly-patternfly1-epel-7.repo +++ /dev/null @@ -1,8 +0,0 @@ -[patternfly-patternfly1] -name=Copr repo for patternfly1 owned by patternfly -baseurl=https://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-7-$basearch/ -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/pubkey.gpg -enabled=1 -enabled_metadata=1 diff --git a/roles/pdc/frontend/tasks/main.yml b/roles/pdc/frontend/tasks/main.yml index a885e28e4..e522b80f4 100644 --- a/roles/pdc/frontend/tasks/main.yml +++ b/roles/pdc/frontend/tasks/main.yml @@ -1,4 +1,3 @@ - - name: setup the PDC copr repo copy: > src="sochotni-pdc-test-epel-7.repo" @@ -9,16 +8,6 @@ tags: - pdc -- name: setup the patternfly copr repo - copy: > - src="patternfly-patternfly1-epel-7.repo" - dest="/etc/yum.repos.d/patternfly-patternfly1-epel-7.repo" - owner=root - group=root - mode=0644 - tags: - - pdc - - name: lastly, add a copr repo for extra deps of PDC. copy: > src="ralph-pdc-deps-epel-7.repo" @@ -29,6 +18,12 @@ tags: - pdc +- name: remove some old copr repos for things now in the infra repo. + file: dest="/etc/yum.repos.d/{{item}}" state=absent + with_items: + - patternfly-patternfly1-epel-7.repo + tags: pdc + - name: install needed packages yum: pkg={{ item }} state=present with_items: |