diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2016-02-08 13:45:36 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2016-02-08 13:45:36 +0000 |
| commit | aea99d716e9d14aedc9ddf266bba8f4c6493036b (patch) | |
| tree | 80736eef3dce4e6d185ea59a950900b52c1d8fa9 | |
| parent | 1e3adf6ab93c3ba0c24fe4c399727146fa3e9e08 (diff) | |
| parent | e93fdafa4dc829bb42be4787efe447b1851f0b1b (diff) | |
| download | ansible-aea99d716e9d14aedc9ddf266bba8f4c6493036b.tar.gz ansible-aea99d716e9d14aedc9ddf266bba8f4c6493036b.tar.xz ansible-aea99d716e9d14aedc9ddf266bba8f4c6493036b.zip | |
Merge branch 'master' of /git/ansible
| -rw-r--r-- | playbooks/hosts/osbs-dev.fedorainfracloud.org.yml | 2 | ||||
| -rw-r--r-- | roles/pdc/backend/files/ralph-pdc-updater-epel-7.repo | 8 | ||||
| -rw-r--r-- | roles/pdc/backend/tasks/main.yml | 7 |
3 files changed, 3 insertions, 14 deletions
diff --git a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml index 9ce390610..3636444fe 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 }}" 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 c7cd6c2e3..000000000 --- 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 df85adeb1..1f6d7a97f 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 |