Merge branch 'master' of /git/ansible

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 }}"

roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo

@@ -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

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