diff --git a/roles/bootstrap_os/tasks/centos.yml b/roles/bootstrap_os/tasks/centos.yml index a113c573d..02cc429f0 100644 --- a/roles/bootstrap_os/tasks/centos.yml +++ b/roles/bootstrap_os/tasks/centos.yml @@ -17,32 +17,6 @@ when: not skip_http_proxy_on_os_packages # For Oracle Linux install public repo -- name: Download Oracle Linux public yum repo - get_url: - url: https://yum.oracle.com/public-yum-ol7.repo - dest: /etc/yum.repos.d/public-yum-ol7.repo - mode: "0644" - when: - - use_oracle_public_repo | default(true) - - '''ID="ol"'' in os_release.stdout_lines' - - (ansible_distribution_version | float) < 7.6 - environment: "{{ proxy_env }}" - -- name: Enable Oracle Linux repo - community.general.ini_file: - dest: /etc/yum.repos.d/public-yum-ol7.repo - section: "{{ item }}" - option: enabled - value: "1" - mode: "0644" - with_items: - - ol7_latest - - ol7_addons - - ol7_developer_EPEL - when: - - use_oracle_public_repo | default(true) - - '''ID="ol"'' in os_release.stdout_lines' - - (ansible_distribution_version | float) < 7.6 - name: Install EPEL for Oracle Linux repo package package: diff --git a/roles/system_packages/tasks/main.yml b/roles/system_packages/tasks/main.yml index 269c4bc03..d9cffada6 100644 --- a/roles/system_packages/tasks/main.yml +++ b/roles/system_packages/tasks/main.yml @@ -15,37 +15,6 @@ - ansible_pkg_mgr == 'zypper' tags: bootstrap_os -- name: Add debian 10 required repos - when: - - ansible_distribution == "Debian" - - ansible_distribution_version == "10" - tags: - - bootstrap_os - block: - - name: Add Debian Backports apt repo - apt_repository: - repo: "deb http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main" - state: present - filename: debian-backports - - - name: Set libseccomp2 pin priority to apt_preferences on Debian buster - copy: - content: | - Package: libseccomp2 - Pin: release a={{ ansible_distribution_release }}-backports - Pin-Priority: 1001 - dest: "/etc/apt/preferences.d/libseccomp2" - owner: "root" - mode: "0644" - -- name: Update package management cache (APT) - apt: - update_cache: true - cache_valid_time: 3600 - when: ansible_os_family == "Debian" - tags: - - bootstrap_os - - name: Remove legacy docker repo file file: path: "{{ yum_repo_dir }}/docker.repo"