diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2017-08-10 17:45:26 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2017-08-10 17:45:26 +0000 |
| commit | 3cb2683c7a5f1aaca9aba6478f1c5afec4a2b33f (patch) | |
| tree | 45fd5318d85cc5bd9c96e4db6ebb486ec0ed865c | |
| parent | 74b74a5bb3309c337ab4ea7181d2b0b01a13d888 (diff) | |
| download | ansible-3cb2683c7a5f1aaca9aba6478f1c5afec4a2b33f.tar.gz ansible-3cb2683c7a5f1aaca9aba6478f1c5afec4a2b33f.tar.xz ansible-3cb2683c7a5f1aaca9aba6478f1c5afec4a2b33f.zip | |
clean up more old infrastructure-testing repo stuff
| -rw-r--r-- | inventory/group_vars/taskotron-dev-client-hosts | 3 | ||||
| -rw-r--r-- | inventory/group_vars/taskotron-stg-client-hosts | 3 | ||||
| -rw-r--r-- | roles/blockerbugs/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/taskotron/fake_fedorainfra/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron-dev-client-hosts index 474fb5f2e..b618fb4eb 100644 --- a/inventory/group_vars/taskotron-dev-client-hosts +++ b/inventory/group_vars/taskotron-dev-client-hosts @@ -13,8 +13,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers" freezes: false # this enables extra repos during dnf install but that's broken right now, remember to re-enable -extra_enablerepos: 'infrastructure-testing' -#extra_enablerepos: '' +extra_enablerepos: '' ############################################################ diff --git a/inventory/group_vars/taskotron-stg-client-hosts b/inventory/group_vars/taskotron-stg-client-hosts index 3c7e6b69d..be04261f7 100644 --- a/inventory/group_vars/taskotron-stg-client-hosts +++ b/inventory/group_vars/taskotron-stg-client-hosts @@ -13,8 +13,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers" freezes: false # this enables extra repos during dnf install but that's broken right now, remember to re-enable -extra_enablerepos: 'infrastructure-testing' -#extra_enablerepos: '' +extra_enablerepos: '' ############################################################ diff --git a/roles/blockerbugs/tasks/main.yml b/roles/blockerbugs/tasks/main.yml index 55606954f..de843891e 100644 --- a/roles/blockerbugs/tasks/main.yml +++ b/roles/blockerbugs/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: install needed packages for blockerbugs - yum: state=present name={{ item }} enablerepo=epel-testing,infrastructure-testing + yum: state=present name={{ item }} enablerepo=epel-testing with_items: - libsemanage-python - python-psycopg2 diff --git a/roles/taskotron/fake_fedorainfra/tasks/main.yml b/roles/taskotron/fake_fedorainfra/tasks/main.yml index 9b7e6627b..5bc34cb23 100644 --- a/roles/taskotron/fake_fedorainfra/tasks/main.yml +++ b/roles/taskotron/fake_fedorainfra/tasks/main.yml @@ -6,7 +6,7 @@ - fake_fedorainfra - name: ensure packages required for fakefedorainfra are installed (infra-testing) - yum: name={{ item }} state=latest enablerepo=infrastructure-testing + yum: name={{ item }} state=latest when: deployment_type == 'dev' or deployment_type == 'stg' with_items: - mod_wsgi diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 index cff0adce7..7f2b13e91 100644 --- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 @@ -155,8 +155,6 @@ default_disposable_release: "25" ## Additional repos for minion to install packages from minion_repos: - - https://infrastructure.fedoraproject.org/repo/infrastructure.repo - - https://infrastructure.fedoraproject.org/repo/infrastructure-testing.repo {% if deployment_type == 'dev' %} - https://copr.fedorainfracloud.org/coprs/kparal/taskotron-dev/repo/fedora-25/kparal-taskotron-dev-fedora-25.repo {% endif %} |