From d5817fd87a209215b44fe75109ef3ff8ba7b5171 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 May 2020 23:40:06 -0400 Subject: [PATCH] Remove repo files no longer used in build process --- .../roles/image_build/files/google-cloud-sdk.repo | 7 ------- installer/roles/image_build/files/rsyslog.repo | 7 ------- installer/roles/image_build/tasks/main.yml | 14 -------------- tools/docker-compose/ansible_nightly.repo | 5 ----- tools/docker-compose/google-cloud-sdk.repo | 7 ------- tools/docker-compose/proot.repo | 8 -------- tools/docker-compose/rsyslog.repo | 7 ------- 7 files changed, 55 deletions(-) delete mode 100644 installer/roles/image_build/files/google-cloud-sdk.repo delete mode 100644 installer/roles/image_build/files/rsyslog.repo delete mode 100644 tools/docker-compose/ansible_nightly.repo delete mode 100644 tools/docker-compose/google-cloud-sdk.repo delete mode 100644 tools/docker-compose/proot.repo delete mode 100644 tools/docker-compose/rsyslog.repo diff --git a/installer/roles/image_build/files/google-cloud-sdk.repo b/installer/roles/image_build/files/google-cloud-sdk.repo deleted file mode 100644 index 1aa0e1d7e0..0000000000 --- a/installer/roles/image_build/files/google-cloud-sdk.repo +++ /dev/null @@ -1,7 +0,0 @@ -[google-cloud-sdk] -name=Google Cloud SDK -baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64 -enabled=1 -gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg diff --git a/installer/roles/image_build/files/rsyslog.repo b/installer/roles/image_build/files/rsyslog.repo deleted file mode 100644 index 4cc2a35a42..0000000000 --- a/installer/roles/image_build/files/rsyslog.repo +++ /dev/null @@ -1,7 +0,0 @@ -[rsyslog_v8] -name=Adiscon CentOS-$releasever - local packages for $basearch -baseurl=http://rpms.adiscon.com/v8-stable/epel-$releasever/$basearch -enabled=1 -gpgcheck=0 -gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon -protect=1 diff --git a/installer/roles/image_build/tasks/main.yml b/installer/roles/image_build/tasks/main.yml index 899ae2c89f..669e5bcc57 100644 --- a/installer/roles/image_build/tasks/main.yml +++ b/installer/roles/image_build/tasks/main.yml @@ -130,20 +130,6 @@ mode: '0700' delegate_to: localhost -- name: Stage google-cloud-sdk.repo - copy: - src: google-cloud-sdk.repo - dest: "{{ docker_base_path }}/google-cloud-sdk.repo" - mode: '0700' - delegate_to: localhost - -- name: Stage rsyslog.repo - copy: - src: rsyslog.repo - dest: "{{ docker_base_path }}/rsyslog.repo" - mode: '0700' - delegate_to: localhost - - name: Stage rsyslog.conf copy: src: rsyslog.conf diff --git a/tools/docker-compose/ansible_nightly.repo b/tools/docker-compose/ansible_nightly.repo deleted file mode 100644 index 8742f3f9ac..0000000000 --- a/tools/docker-compose/ansible_nightly.repo +++ /dev/null @@ -1,5 +0,0 @@ -[ansible-nightly] -name=ansible-nightly -baseurl=https://releases.ansible.com/ansible/rpm/nightly/devel/epel-8-$basearch -gpgcheck=0 -enabled=1 diff --git a/tools/docker-compose/google-cloud-sdk.repo b/tools/docker-compose/google-cloud-sdk.repo deleted file mode 100644 index 1aa0e1d7e0..0000000000 --- a/tools/docker-compose/google-cloud-sdk.repo +++ /dev/null @@ -1,7 +0,0 @@ -[google-cloud-sdk] -name=Google Cloud SDK -baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64 -enabled=1 -gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg diff --git a/tools/docker-compose/proot.repo b/tools/docker-compose/proot.repo deleted file mode 100644 index d62e8e5b9e..0000000000 --- a/tools/docker-compose/proot.repo +++ /dev/null @@ -1,8 +0,0 @@ -[jlaska-proot] -name=Copr repo for proot owned by jlaska -baseurl=https://copr-be.cloud.fedoraproject.org/results/jlaska/proot/epel-7-$basearch/ -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/jlaska/proot/pubkey.gpg -enabled=1 -enabled_metadata=1 diff --git a/tools/docker-compose/rsyslog.repo b/tools/docker-compose/rsyslog.repo deleted file mode 100644 index 4cc2a35a42..0000000000 --- a/tools/docker-compose/rsyslog.repo +++ /dev/null @@ -1,7 +0,0 @@ -[rsyslog_v8] -name=Adiscon CentOS-$releasever - local packages for $basearch -baseurl=http://rpms.adiscon.com/v8-stable/epel-$releasever/$basearch -enabled=1 -gpgcheck=0 -gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon -protect=1