From 01ee795c28e4bd59ca4bf390af8e6374eb5cbf44 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 8 Feb 2016 13:44:14 +0000 Subject: [PATCH 1/2] osbs-dev: fix post-install image stream creation - round 2 --- playbooks/hosts/osbs-dev.fedorainfracloud.org.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml index 9ce390610e..3636444fec 100644 --- a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml @@ -114,5 +114,5 @@ service: name=docker state=started enabled=yes - name: create fedora image stream for OpenShift - shell: 'echo \'{ "apiVersion": "v1", "kind": "ImageStream", "metadata": { "name": "fedora" }, "spec": { "dockerImageRepository": "osbs-dev.fedorainfracloud.org:5000/fedora" } }\' | oc create -f -' + shell: echo '{ "apiVersion": "v1", "kind": "ImageStream", "metadata": { "name": "fedora" }, "spec": { "dockerImageRepository": "osbs-dev.fedorainfracloud.org:5000/fedora" } }' | oc create -f - environment: "{{ osbs_environment }}" From e93fdafa4dc829bb42be4787efe447b1851f0b1b Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 8 Feb 2016 13:44:51 +0000 Subject: [PATCH 2/2] Remove pdc-updater copr repo. This is in the infra repo now. --- roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo | 8 -------- roles/pdc/backend/tasks/main.yml | 7 ++----- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo diff --git a/roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo b/roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo deleted file mode 100644 index c7cd6c2e3d..0000000000 --- a/roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo +++ /dev/null @@ -1,8 +0,0 @@ -[ralph-pdc-updater] -name=Copr repo for pdc-updater owned by ralph -baseurl=https://copr-be.cloud.fedoraproject.org/results/ralph/pdc-updater/epel-7-$basearch/ -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/ralph/pdc-updater/pubkey.gpg -enabled=1 -enabled_metadata=1 \ No newline at end of file diff --git a/roles/pdc/backend/tasks/main.yml b/roles/pdc/backend/tasks/main.yml index df85adeb11..1f6d7a97ff 100644 --- a/roles/pdc/backend/tasks/main.yml +++ b/roles/pdc/backend/tasks/main.yml @@ -1,11 +1,8 @@ --- # Configuration for the pdc-updater backend consumer -- name: setup the pdc-updater copr repo - copy: > - src="ralph-pdc-updater-epel-7.repo" - dest="/etc/yum.repos.d/ralph-pdc-updater-epel-7.repo" - owner=root group=root mode=0644 +- name: remove the old pdc-updater repo + file: dest=/etc/yum.repos.d/ralph-pdc-updater-epel-7.repo state=absent tags: pdc - name: install needed packages