From 432a3a497b9b3ceaa7883f719deec4eb481499c9 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 3 Jul 2024 21:42:02 +0000 Subject: [PATCH] Go through and remove entries for EL6 and EL7 Using `git grep el6` and `git grep el7` and variants like EL-7 or el-7, I found various entries and files which were no longer needed with the current ansible. I updated text or tests to later versions of RHEL as needed. found entries for the fedora ami's for the original cloud and removed those entries also. Signed-off-by: Stephen Smoogen --- files/common/epel6.repo | 13 ---- files/common/rhel-7-aarch64-server-rpms.repo | 13 ---- files/common/rhel6.repo | 14 ----- files/common/rhel7-power-rhev.repo | 4 -- files/common/rhel7-power9.repo | 19 ------ files/common/rhel7.repo | 24 -------- files/common/rhel7ah.repo | 4 -- files/common/rhos13.repo | 4 -- inventory/group_vars/all | 9 ++- inventory/group_vars/download_rdu2 | 9 --- playbooks/groups/proxies.yml | 2 +- roles/apache/tasks/main.yml | 20 ------- roles/base/tasks/main.yml | 20 ------- roles/batcave/files/rhel6-sync | 44 -------------- roles/batcave/files/rhel7-rhos.repo | 4 -- roles/batcave/files/rhel7-sync | 56 ------------------ roles/batcave/tasks/main.yml | 10 ---- .../infrastructure.fedoraproject.org.conf.j2 | 2 +- roles/dhcp_server/tasks/main.yml | 8 --- .../templates/httpd/dl.fedoraproject.org.conf | 2 +- roles/fedmsg/base/tasks/main.yml | 15 ----- roles/koji_hub/tasks/main.yml | 11 ---- roles/mariadb_server/tasks/main.yml | 9 +-- roles/openvpn/base/tasks/main.yml | 6 +- roles/openvpn/client/tasks/main.yml | 10 ++-- roles/rsyncd/tasks/main.yml | 4 +- ...lt.cloud-noc-os01.rdu-cc.fedoraproject.org | 15 ----- .../default.dhcp01.phx2.fedoraproject.org | 58 ------------------ .../default.noc01.phx2.fedoraproject.org | 59 ------------------- roles/varnish/tasks/main.yml | 8 --- roles/virthost/files/rhel7-os.repo | 5 -- roles/virthost/files/rhel7-rhev-aarch64.repo | 6 -- roles/virthost/files/rhel7-rhev-ppc64le.repo | 5 -- tasks/openvpn_client_7.yml | 2 +- vars/global.yml | 45 -------------- 35 files changed, 16 insertions(+), 523 deletions(-) delete mode 100644 files/common/epel6.repo delete mode 100644 files/common/rhel-7-aarch64-server-rpms.repo delete mode 100644 files/common/rhel6.repo delete mode 100644 files/common/rhel7-power-rhev.repo delete mode 100644 files/common/rhel7-power9.repo delete mode 100644 files/common/rhel7.repo delete mode 100644 files/common/rhel7ah.repo delete mode 100644 files/common/rhos13.repo delete mode 100644 inventory/group_vars/download_rdu2 delete mode 100644 roles/batcave/files/rhel6-sync delete mode 100644 roles/batcave/files/rhel7-rhos.repo delete mode 100644 roles/batcave/files/rhel7-sync delete mode 100644 roles/tftp_server/files/default.dhcp01.phx2.fedoraproject.org delete mode 100644 roles/tftp_server/files/default.noc01.phx2.fedoraproject.org delete mode 100644 roles/virthost/files/rhel7-os.repo delete mode 100644 roles/virthost/files/rhel7-rhev-aarch64.repo delete mode 100644 roles/virthost/files/rhel7-rhev-ppc64le.repo diff --git a/files/common/epel6.repo b/files/common/epel6.repo deleted file mode 100644 index f2b2dcbc7f..0000000000 --- a/files/common/epel6.repo +++ /dev/null @@ -1,13 +0,0 @@ -[epel] -name=Extras Packages for Enterprise Linux $releasever - $basearch -baseurl=https://dl.fedoraproject.org/pub/archive/epel/6/$basearch/ -enabled=1 -gpgcheck=1 -gpgkey=https://infrastructure.fedoraproject.org/pub/archive/epel/RPM-GPG-KEY-EPEL-6 - -[epel-testing] -name=Extras Packages for Enterprise Linux $releasever - $basearch -baseurl=https://dl.fedoraproject.org/pub/archive/epel/testing/6/$basearch/ -enabled=0 -gpgcheck=1 -gpgkey=https://infrastructure.fedoraproject.org/pub/archive/epel/RPM-GPG-KEY-EPEL-6 diff --git a/files/common/rhel-7-aarch64-server-rpms.repo b/files/common/rhel-7-aarch64-server-rpms.repo deleted file mode 100644 index b2e044e278..0000000000 --- a/files/common/rhel-7-aarch64-server-rpms.repo +++ /dev/null @@ -1,13 +0,0 @@ -[rhel-7-alt-for-arm-64-optional-rpms] -name = rhel7 $basearch server optional -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-alt-for-arm-64-optional-rpms/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -enabled=1 -gpgcheck=1 - -[rhel-7-alt-for-arm-64-rpms] -name = rhel7 $basearch server -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-alt-for-arm-64-rpms/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -enabled=1 -gpgcheck=1 diff --git a/files/common/rhel6.repo b/files/common/rhel6.repo deleted file mode 100644 index ad035f55fd..0000000000 --- a/files/common/rhel6.repo +++ /dev/null @@ -1,14 +0,0 @@ -[rhel6-dvd] -name = rhel6 base dvd -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/RHEL6-$basearch/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel6-base] -name = rhel6 base $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel-$basearch-server-6/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel6-optional] -name = rhel6 optional $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel-$basearch-server-optional-6/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/files/common/rhel7-power-rhev.repo b/files/common/rhel7-power-rhev.repo deleted file mode 100644 index 1283219713..0000000000 --- a/files/common/rhel7-power-rhev.repo +++ /dev/null @@ -1,4 +0,0 @@ -[rhel7-rhev] -name = rhel7 rhev $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-for-rhev-power-agents-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/files/common/rhel7-power9.repo b/files/common/rhel7-power9.repo deleted file mode 100644 index 78f2d00a6f..0000000000 --- a/files/common/rhel7-power9.repo +++ /dev/null @@ -1,19 +0,0 @@ -[rhel7-power9-dvd] -name = rhel7-power9 base dvd -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/RHEL7.6-power9/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-power9-base] -name = rhel7-power9 base $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/power9/$basearch/rhel-7-server-power9 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-power9-optional] -name = rhel7-power9 optional $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/power9/$basearch/rhel-7-server-power9-optional -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-power9-extras] -name = rhel7-power9 extras $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/power9/$basearch/rhel-7-server-power9-extras -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/files/common/rhel7.repo b/files/common/rhel7.repo deleted file mode 100644 index 8ed58ddd9e..0000000000 --- a/files/common/rhel7.repo +++ /dev/null @@ -1,24 +0,0 @@ -[rhel7-dvd] -name = rhel7 base dvd -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/RHEL7-$basearch/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-base] -name = rhel7 base $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-optional] -name = rhel7 optional $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-optional-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-extras] -name = rhel7 extras $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-extras-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release - -[rhel7-ha] -name = rhel7 ha $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-ha-for-rhel-7-server-rpms/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/files/common/rhel7ah.repo b/files/common/rhel7ah.repo deleted file mode 100644 index f3eb5ef8f9..0000000000 --- a/files/common/rhel7ah.repo +++ /dev/null @@ -1,4 +0,0 @@ -[rhel7-atomic-host] -name = rhel7 Atomic Host $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-atomic-host-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/files/common/rhos13.repo b/files/common/rhos13.repo deleted file mode 100644 index da30cdb9e9..0000000000 --- a/files/common/rhos13.repo +++ /dev/null @@ -1,4 +0,0 @@ -[rhel7-rhos13] -name = rhel7 openstack $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openstack-13-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 39fd0ee4b9..960f8a717f 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -152,9 +152,9 @@ ipa_server_nodes: - ipa01.iad2.fedoraproject.org - ipa02.iad2.fedoraproject.org - ipa03.iad2.fedoraproject.org -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ +ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL9-x86_64/ # defaults for virt installs -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 +ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel # most of our systems are 64bit. # Used to install various nagios scripts and the like. libdir: /usr/lib64 @@ -273,7 +273,7 @@ udp_ports: [] # EPEL files because EPEL overrides packages in their core repos. use_default_epel: true # -# The default virt-install works for rhel7 or fedora with 1 nic +# The default virt-install works for rhel9 or fedora with 1 nic # virt_install_command: "{{ virt_install_command_one_nic }}" virt_install_command_aarch64_one_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole @@ -283,8 +283,7 @@ virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} --memory= virt_install_command_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns1 }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --watchdog default --rng /dev/random --cpu host virt_install_command_ppc64le_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ eth0_ipv4_nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --watchdog default --rng /dev/random virt_install_command_ppc64le_two_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }} --autostart --noautoconsole --watchdog default --rng /dev/random -virt_install_command_pxe_rhcos: virt-install -n {{ inventory_hostname }} --vcpus {{ num_cpus }},maxvcpus={{ num_cpus }} --cpu host --memory {{ mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --nographics --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --hvm --accelerate --autostart --wait=-1 --extra-args "ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:ens2:none hostname={{ inventory_hostname }} nameserver={{ dns }} console=ttyS0 nomodeset rd.neednet=1 coreos.inst=yes coreos.inst.install_dev=vda coreos.live.rootfs_url={{ rhcos_install_rootfs_url }} coreos.inst.ignition_url={{ rhcos_ignition_file_url }}" --os-variant rhel7 --location {{ rhcos_install_url }} -virt_install_command_rhel6: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x "inst.ksdevice=eth0 inst.ks={{ ks_url }} ip={{ eth0_ipv4_ip }} netmask={{ nm }} gateway={{ eth0_ipv4_gw }} dns={{ dns }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }}" --network=bridge=br0 --autostart --noautoconsole --watchdog default +virt_install_command_pxe_rhcos: virt-install -n {{ inventory_hostname }} --vcpus {{ num_cpus }},maxvcpus={{ num_cpus }} --cpu host --memory {{ mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --nographics --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --hvm --accelerate --autostart --wait=-1 --extra-args "ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:ens2:none hostname={{ inventory_hostname }} nameserver={{ dns }} console=ttyS0 nomodeset rd.neednet=1 coreos.inst=yes coreos.inst.install_dev=vda coreos.live.rootfs_url={{ rhcos_install_rootfs_url }} coreos.inst.ignition_url={{ rhcos_ignition_file_url }}" --os-variant rhel9 --location {{ rhcos_install_url }} virt_install_command_s390x_one_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --rng /dev/random --cpu host virt_install_command_s390x_one_nic_unsafe: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads,discard=unmap --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --autostart --noautoconsole --rng /dev/random --cpu host virt_install_command_two_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x 'net.ifnames=0 inst.ksdevice=eth0 inst.ks={{ ks_url }} console=tty0 console=ttyS0 hostname={{ inventory_hostname }} nameserver={{ dns }} ip={{ eth0_ipv4_ip }}::{{ eth0_ipv4_gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname_short }}-nfs:eth1:none' --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }} --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }} --autostart --noautoconsole --watchdog default --rng /dev/random diff --git a/inventory/group_vars/download_rdu2 b/inventory/group_vars/download_rdu2 deleted file mode 100644 index 8617e2cbda..0000000000 --- a/inventory/group_vars/download_rdu2 +++ /dev/null @@ -1,9 +0,0 @@ ---- -datacenter: rdu -# nfs mount options, overrides the all/default -nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3" -nrpe_procs_crit: 1000 -nrpe_procs_warn: 900 -rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" -tcp_ports: [80, 443, 873] -virt_install_command: "{{ virt_install_command_rhel6 }}" diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 4bb0cfc388..90e5659ec9 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -67,7 +67,7 @@ # - review-stats::build (bapp0*) # ## TBD - # - sysctl ip_conntrack_max bits - do we still need this on rhel7? + # - sysctl ip_conntrack_max bits - do we still need this on rhel9 or fedora? # - semanage ports.. we're likely going to need one for every app. # - sebooleans.. let's try running first, see what gets blocked, and then # selectively enable where semanage port fails diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml index f2968c7dff..9b68cfe0ed 100644 --- a/roles/apache/tasks/main.yml +++ b/roles/apache/tasks/main.yml @@ -54,26 +54,6 @@ - hotfix - apache -- name: hotfix - copy over new httpd sysconfig (el6) - copy: src="{{ files }}/hotfix/httpd/httpd.sysconfig" dest=/etc/sysconfig/httpd - when: ansible_distribution_major_version|int == 6 and ansible_distribution == 'RedHat' - notify: - - reload apache - tags: - - config - - hotfix - - apache - -- name: hotfix - copy over new httpd sysconfig (el7) - copy: src="{{ files }}/hotfix/httpd/httpd.sysconfig" dest=/etc/sysconfig/httpd - when: ansible_distribution_major_version|int == 7 and ansible_distribution == 'RedHat' - notify: - - reload apache - tags: - - config - - hotfix - - apache - - name: add appserver headers.conf template: src="{{ files }}/httpd/headers.conf.j2" dest=/etc/httpd/conf.d/headers.conf notify: diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 796c5a9e06..ac53b65fa9 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -5,18 +5,7 @@ # Things in here are things we want to do to every machine no matter what. # -# -# on rhel6 and rhel7 installing policycoreutils-python is all we need for ansible -# -- name: ensure packages required for semanage are installed (rhel 6 and 7) - package: name={{ item }} state=present - with_items: - - policycoreutils-python - tags: - - selinux - when: ansible_distribution_major_version|int < 8 and ansible_distribution == 'RedHat' -# # On fedora and rhel larger than 7, all we need is policycoreutils-python-utils, # which in turn pulls in python3-policycoreutils # @@ -26,15 +15,6 @@ tags: - selinux -- name: global default packages to install (yum) - package: state=present name={{ item }} - with_items: - - "{{ global_pkgs_inst }}" - tags: - - packages - - base - when: ansible_distribution_major_version|int < 8 and ansible_distribution == 'RedHat' - - name: global default packages to install (dnf) dnf: state=present name="{{ global_pkgs_inst }}" tags: diff --git a/roles/batcave/files/rhel6-sync b/roles/batcave/files/rhel6-sync deleted file mode 100644 index 5a64eafc33..0000000000 --- a/roles/batcave/files/rhel6-sync +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -RHEL6SYNCDIR=/srv/web/repo/rhel/rhel6 -RHEL6CACHEDIR=/var/tmp/reposync-rhel6 - -cd $RHEL6SYNCDIR - -DNFOPTS='--download-metadata -m -n' - - -mkdir -p ${RHEL6CACHEDIR} -for i in i686 x86_64 ppc64; do -mkdir -p ${RHEL6CACHEDIR}/${i} -done - -#dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-i386.conf ${DNFOPTS} --repoid=rhel-6-server-i386 -p i386 -a i686 --metadata-path ${RHEL6CACHEDIR}/i686 -#dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-i386.conf ${DNFOPTS} --repoid rhel-6-server-optional-i386 -p i386 -a i686 --metadata-path ${RHEL6CACHEDIR}/i686 - -DNF_ARCH="-p x86_64 -a x86_64 -a i686 -a noarch" -dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64 -dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-optional-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64 -dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-ha-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64 -dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-lb-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64 - -dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-ppc64.conf ${DNFOPTS} --repoid rhel-6-server-ppc64 -p ppc64 -a ppc64 -a noarch --metadata-path ${RHEL6CACHEDIR}/ppc64 -dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-ppc64.conf ${DNFOPTS} --repoid rhel-6-server-optional-ppc64 -p ppc64 -a ppc64 -a noarch --metadata-path ${RHEL6CACHEDIR}/ppc64 - -for i in `ls -d /srv/web/repo/rhel/rhel6/i386/*` -do - cd $i - createrepo_c -q --update --compatibility --compress-type bz2 --workers 6 . -done - -for i in `ls -d /srv/web/repo/rhel/rhel6/x86_64/*` -do - cd $i - createrepo_c -q --update --compatibility --compress-type bz2 --workers 6 . -done - -for i in `ls -d /srv/web/repo/rhel/rhel6/ppc64/*` -do - cd $i - createrepo_c -q --update --compatibility --compress-type bz2 --workers 6 . -done diff --git a/roles/batcave/files/rhel7-rhos.repo b/roles/batcave/files/rhel7-rhos.repo deleted file mode 100644 index dcea215898..0000000000 --- a/roles/batcave/files/rhel7-rhos.repo +++ /dev/null @@ -1,4 +0,0 @@ -[rhel7-rhos] -name = rhel7 openstack $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openstack-5.0-rpms -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/roles/batcave/files/rhel7-sync b/roles/batcave/files/rhel7-sync deleted file mode 100644 index 2a7c910625..0000000000 --- a/roles/batcave/files/rhel7-sync +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -RHEL7SYNCDIR=/srv/web/repo/rhel/rhel7 -SYNCDIR=/var/cache/reposync/ -YUMDIR=/var/tmp/reposync-rhel7/ - -## Need to download the metadata and the modular data -DNFOPTS='--download-metadata --remote-time --delete' - -ARCHES="ppc64le s390x x86_64" -#ARCHES="x86_64" - -mkdir -vp ${SYNCDIR} ${RHEL7SYNCDIR} ${YUMDIR} -for A in ${ARCHES}; do - mkdir -vp ${YUMDIR}/${A} -done - -cd $RHEL7SYNCDIR - -echoerr() { printf "%s\n" "$*" >&2; } -## -## Sync out RHEL-7 for appropriate arches -for A in ${ARCHES}; do - if [[ ${A} == 'x86_64' ]]; then - DNF_ARCH="-p ${A} -a ${A} -a noarch -a i686" - else - DNF_ARCH="-p ${A} -a ${A} -a noarch" - fi - rm -rf ${SYNCDIR}/${A} - CONF=yum-batcave-rhel7-${A}.conf - REPOS="rhel-7-for-${A}-server-rpms rhel-7-ha-for-${A}-server-rpms rhel-7-extras-for-${A}-server-rpms rhel-7-optional-for-${A}-server-rpms rhel-7-devtools-for-${A}-server-rpms rhel-7-rhscl-for-${A}-server-rpms" - for R in ${REPOS}; do - rm -rf ${YUMDIR}/${R} - # Test to see if we have this repository in our tree - grep -q ${R} ${RHEL7SYNCDIR}/${CONF} - if [[ $? -eq 0 ]]; then - echo "Syncing ${R} for ${A}" - dnf reposync -c ${RHEL7SYNCDIR}/${CONF} ${DNFOPTS} --repoid ${R} ${DNF_ARCH} --metadata-path ${YUMDIR}/${A} - if [[ $? -ne 0 ]]; then - echoerr "Something went wrong with reposync -c ${RHEL7SYNCDIR}/${CONF} ${DNFOPTS} --repoid ${R} ${DNF_ARCH} --metadata-path ${YUMDIR}/${A}" - continue - fi - ## Try to create repo - pushd ${RHEL7SYNCDIR}/${A}/${R} &> /dev/null - createrepo_c -q --update --workers 6 . - if [[ $? -ne 0 ]]; then - echoerr "Something went wrong with createrepo ${A} ${R}" - continue - fi - popd &> /dev/null - fi - done -done - -#ostree pull --repo=/mnt/fedora/app/fi-repo/rhel/rhel7/atomic/rhel7 --mirror redhat -## This section is for all the trees which are not easily scriptable diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml index 90c3e2aeae..c748f3946b 100644 --- a/roles/batcave/tasks/main.yml +++ b/roles/batcave/tasks/main.yml @@ -271,17 +271,7 @@ - config when: inventory_hostname.startswith('batcave01') -# -# Setup rhel6 sync script. -# -- name: setup rhel6 sync script - copy: src=rhel6-sync dest=/mnt/fedora/app/fi-repo/rhel/rhel6/rhel6-sync mode=0775 - tags: - - batcave - - config - when: inventory_hostname.startswith('batcave01') -# # Setup rhel8 sync script. # diff --git a/roles/batcave/templates/infrastructure.fedoraproject.org.conf.j2 b/roles/batcave/templates/infrastructure.fedoraproject.org.conf.j2 index fb14d13b2c..46daa72c7f 100644 --- a/roles/batcave/templates/infrastructure.fedoraproject.org.conf.j2 +++ b/roles/batcave/templates/infrastructure.fedoraproject.org.conf.j2 @@ -130,7 +130,7 @@ ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" # https://fedorahosted.org/fedora-infrastructure/ticket/4101#comment:14 # If you change the protocols or cipher suites, you should probably update - # modules/squid/files/squid.conf-el6 too, to keep it in sync. + # modules/squid/files/squid.conf too, to keep it in sync. SSLProtocol {{ ssl_protocols }} SSLCipherSuite {{ ssl_ciphers }} diff --git a/roles/dhcp_server/tasks/main.yml b/roles/dhcp_server/tasks/main.yml index ccd924cfb9..a622af5fa2 100644 --- a/roles/dhcp_server/tasks/main.yml +++ b/roles/dhcp_server/tasks/main.yml @@ -1,12 +1,4 @@ --- -- name: install dhcp server package (rhel7) - package: state=present name=dhcp - tags: - - packages - - base - - dhcp_server - when: ansible_distribution_major_version|int == 7 - - name: install dhcp server package (rhel8) package: state=present name=dhcp-server tags: diff --git a/roles/download/templates/httpd/dl.fedoraproject.org.conf b/roles/download/templates/httpd/dl.fedoraproject.org.conf index 2f5a572120..6346cc96f9 100644 --- a/roles/download/templates/httpd/dl.fedoraproject.org.conf +++ b/roles/download/templates/httpd/dl.fedoraproject.org.conf @@ -22,7 +22,7 @@ # https://fedorahosted.org/fedora-infrastructure/ticket/4101#comment:14 # If you change the protocols or cipher suites, you should probably update - # modules/squid/files/squid.conf-el6 too, to keep it in sync. + # modules/squid/files/squid.conf too, to keep it in sync. SSLProtocol {{ ssl_protocols }} SSLCipherSuite {{ ssl_ciphers }} diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index e846fe4ce3..5a8b56f6be 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -42,21 +42,6 @@ - fedmsg/base when: ansible_distribution_major_version|int < 31 and ansible_distribution == 'Fedora' -# We only need this on el6. On el7, the fedmsg package uses systemd-tempfiles -# to generate this effect for us. Note that at the bottom of this role we add -# the nrpe user to the fedmsg group so that it has *write* permissions to a unix -# socket in this dir. -- name: create a /var/run/fedmsg dir with setgid for monitoring. - file: > - dest=/var/run/fedmsg - mode=2775 - owner=fedmsg - group=fedmsg - state=directory - when: ansible_distribution_major_version|int == 6 - tags: - - fedmsg/base - - name: setup /etc/fedmsg.d directory file: path=/etc/fedmsg.d owner=root group=root mode=0755 state=directory tags: diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 19afa51128..d0abeb67f7 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -93,17 +93,6 @@ - selinux - koji_hub -- name: install fedora-messaging as a dependency for the plugin (rhel7) - package: name={{ item }} state=present - with_items: - - python2-fedora-messaging - - python2-koji-sidetag-plugin-hub - tags: - - packages - - koji_hub - - fedora-messaging - when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 7 - - name: install fedora-messaging as a dependency for the plugin (fedora) package: name={{ item }} state=present with_items: diff --git a/roles/mariadb_server/tasks/main.yml b/roles/mariadb_server/tasks/main.yml index e92e2e2ce1..9716297c7e 100644 --- a/roles/mariadb_server/tasks/main.yml +++ b/roles/mariadb_server/tasks/main.yml @@ -5,19 +5,12 @@ - mariadb-server when: ansible_cmdline.ostree is not defined -- name: ensure packages required for mariadb are installed (el7) - package: - state: present - name: - - MySQL-python - when: ansible_distribution_major_version|int < 8 - - name: ensure packages required for mariadb are installed (el8) package: state: present name: - python3-PyMySQL - when: ansible_distribution_major_version|int > 7 + when: ansible_distribution_major_version|int >= 8 - name: copy my.cnf copy: src={{ item }} dest=/etc/my.cnf owner=root group=root mode=0644 diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml index 749dcb8e58..6208395784 100644 --- a/roles/openvpn/base/tasks/main.yml +++ b/roles/openvpn/base/tasks/main.yml @@ -17,8 +17,6 @@ tags: - install - openvpn - #notify: - #- restart openvpn (RHEL7+) - name: Install ca for server copy: src={{ private }}/files/vpn/pki/ca.crt @@ -30,7 +28,7 @@ #notify: #- restart openvpn (Fedora) -- name: Install certificate and key (rhel7 or fedora) for server +- name: Install certificate and key (rhel or fedora) for server copy: src={{ private }}/files/vpn/pki/ca.crt dest=/etc/openvpn/server/ca.crt owner=root group=root mode=0600 @@ -39,8 +37,6 @@ - openvpn #notify: #- restart openvpn (Fedora) - #- restart openvpn (RHEL7) - #- restart openvpn (RHEL6) when: inventory_hostname.startswith('bastion0') - name: install fix-routes.sh script diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml index 404518d56b..87bda5b7d8 100644 --- a/roles/openvpn/client/tasks/main.yml +++ b/roles/openvpn/client/tasks/main.yml @@ -19,9 +19,8 @@ - openvpn # notify: # - restart openvpn (Fedora) -# - restart openvpn (RHEL6+) -- name: Install configuration files (rhel7 and fedora) +- name: Install configuration files (rhel and fedora) copy: src={{ item.file }} dest={{ item.dest }} owner=root group=root mode={{ item.mode }} @@ -37,9 +36,8 @@ - openvpn # notify: # - restart openvpn (Fedora) -# - restart openvpn (RHEL7) -- name: Make sure openvpn is running in rhel 7+ +- name: Make sure openvpn is running in rhel 8+ service: name=openvpn-client@openvpn state=started enabled=true tags: - service @@ -55,7 +53,7 @@ - name: Create directories for post-vpn service configs file: path="/etc/systemd/system/{{item}}.service.d" state=directory with_items: "{{postvpnservices}}" - when: is_fedora is defined or (ansible_distribution_major_version|int >= 7 and ansible_distribution == 'RedHat') + when: is_fedora is defined or (ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat') tags: - service - openvpn @@ -63,7 +61,7 @@ - name: Deploy postvpn.conf for post-vpn services copy: src=postvpn.conf dest="/etc/systemd/system/{{item}}.service.d/postvpn.conf" with_items: "{{postvpnservices}}" - when: is_fedora is defined or (ansible_distribution_major_version|int >= 7 and ansible_distribution == 'RedHat') + when: is_fedora is defined or (ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat') tags: - service - openvpn diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml index 493c89f51d..b7c6edef4f 100644 --- a/roles/rsyncd/tasks/main.yml +++ b/roles/rsyncd/tasks/main.yml @@ -63,7 +63,7 @@ - config - rsyncd -- name: xinetd rsync file for rhel7 and rhel8 +- name: xinetd rsync file for rhel8 copy: src={{ item }} dest=/etc/xinetd.d/rsync mode=0644 with_first_found: - "{{ rsync }}" @@ -87,7 +87,7 @@ - config - rsyncd -- name: make sure xinetd is started on rhel7 and rhel8 +- name: make sure xinetd is started on rhel8 service: name=xinetd state=started enabled=true when: ansible_distribution_major_version|int < 9 and ansible_distribution == 'RedHat' tags: diff --git a/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org b/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org index 5a7e6769a9..ea5974fc0b 100644 --- a/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org +++ b/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org @@ -15,21 +15,6 @@ LABEL cloud-fx KERNEL images/RHEL/7/x86_64/vmlinuz APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-7-cloud-fx net.ifnames=0 biosdevname=0 -LABEL EL-7-08disk - MENU LABEL el7-08disk - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-7-08disk-ext net.ifnames=0 biosdevname=0 - -LABEL EL-7-rescue - MENU LABEL el7rescue - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL7-x86_64/ ip=dhcp net.ifnames=0 biosdevname=0 rescue - -LABEL EL-7-nohd - MENU LABEL el7nohd - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-7-nohd net.ifnames=0 biosdevname=0 - LABEL EL-8-nohd-ppc64le MENU LABEL el8nohdppc64le KERNEL images/RHEL/8/ppc64le/vmlinuz diff --git a/roles/tftp_server/files/default.dhcp01.phx2.fedoraproject.org b/roles/tftp_server/files/default.dhcp01.phx2.fedoraproject.org deleted file mode 100644 index eb749fd770..0000000000 --- a/roles/tftp_server/files/default.dhcp01.phx2.fedoraproject.org +++ /dev/null @@ -1,58 +0,0 @@ -DEFAULT menu -MENU TITLE Fedora Infrastructure PXE Boot -PROMPT 0 -TIMEOUT 200 -TOTALTIMEOUT 6000 -ONTIMEOUT local - -LABEL local - MENU LABEL (local) - MENU DEFAULT - LOCALBOOT 0 - -LABEL EL-7-rescue - MENU LABEL el7rescue - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ip=dhcp net.ifnames=0 biosdevname=0 rescue - -LABEL EL-7-nohd - MENU LABEL el7nohd - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-nohd net.ifnames=0 biosdevname=0 - -LABEL EL-7-10disk - MENU LABEL el710disk - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-10disk net.ifnames=0 biosdevname=0 - -LABEL CentOS-7-x86_64 - MENU LABEL centos7-nohd - KERNEL images/CentOS/7/x86_64/vmlinuz - APPEND initrd=images/CentOS/7/x86_64/initrd.img method=http://10.5.126.23/repo/centos/7/os/x86_64/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-centos-7-nohd net.ifnames=0 biosdevname=0 - -LABEL Fed26-x86_64-buildhw - MENU LABEL Fedora26-x86_64-buildhw - KERNEL images/Fedora/26/x86_64/vmlinuz - APPEND initrd=images/Fedora/26/x86_64/initrd.img repo=http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/buildhw-f26 text net.ifnames=0 biosdevname=0 ksdevice=eth0 - -LABEL Fed25-x86_64-buildhw - MENU LABEL Fedora25-x86_64-buildhw - KERNEL images/Fedora/25/x86_64/vmlinuz - APPEND initrd=images/Fedora/25/x86_64/initrd.img repo=http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/buildhw-f25 text net.ifnames=0 biosdevname=0 ksdevice=eth0 - -LABEL EL7-ppc64-virthost - MENU LABEL EL7-ppc64-virthost - KERNEL images/RHEL/7/ppc64/vmlinuz - APPEND ks initrd=images/RHEL/7/ppc64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-ppc64/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-power8-BE-12disk.cfg text net.ifnames=0 biosdevname=0 - -LABEL EL7-ppc64le-virthost - MENU LABEL EL7-ppc64le-virthost - KERNEL images/RHEL/7/ppc64le/vmlinuz - APPEND ks initrd=images/RHEL/7/ppc64le/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-ppc64le/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-power8-LE-12disk.cfg text net.ifnames=0 biosdevname=0 - -LABEL Fed24-x86_64-buildhw - MENU LABEL Fedora24-x86_64-buildhw - KERNEL images/Fedora/24/x86_64/vmlinuz - APPEND initrd=images/Fedora/24/x86_64/initrd.img repo=http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/ ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/buildhw text net.ifnames=0 biosdevname=0 ksdevice=eth0 - -MENU end diff --git a/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org b/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org deleted file mode 100644 index 57ad26fde3..0000000000 --- a/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org +++ /dev/null @@ -1,59 +0,0 @@ -DEFAULT menu -MENU TITLE Fedora Infrastructure PXE Boot -PROMPT 0 -TIMEOUT 200 -TOTALTIMEOUT 6000 -ONTIMEOUT local - -LABEL local - MENU LABEL (local) - MENU DEFAULT - LOCALBOOT 0 - -LABEL EL-7-rescue - MENU LABEL el7rescue - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ip=dhcp net.ifnames=0 biosdevname=0 rescue - -LABEL EL-7-nohd - MENU LABEL el7nohd - KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-nohd net.ifnames=0 biosdevname=0 - -LABEL EL-8-nohd (ppc64le) - MENU LABEL el8nohd-ppc64le - KERNEL images/RHEL/8/ppc64le/vmlinuz - APPEND initrd=images/RHEL/8/ppc64le/initrd.img method=http://10.5.126.23/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-8-ppc64le-nohd net.ifnames=0 biosdevname=0 - -LABEL Fed31-rescue - MENU LABEL Fedora31-rescue - KERNEL images/Fedora/31/x86_64/vmlinuz - APPEND initrd=images/Fedora/31/x86_64/initrd.img method=http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ ip=dhcp net.ifnames=0 rescue - -LABEL Fed31-nohd - MENU LABEL Fedora31-nohd - KERNEL images/Fedora/31/x86_64/vmlinuz - APPEND ks initrd=images/Fedora/31/x86_64/initrd.img method=http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-fedora-31-nohd net.ifnames=0 ksdevice=bootif - -LABEL Fed31-08disk - MENU LABEL Fedora31-08disk - KERNEL images/Fedora/31/x86_64/vmlinuz - APPEND ks initrd=images/Fedora/31/x86_64/initrd.img method=http://10.5.126.23/pub/fedora/linux/releases/31/Server/x86_64/os/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-fedora-31-08disk net.ifnames=0 ksdevice=bootif - -LABEL Fed30-ppc64le - MENU LABEL Fedora30-ppc64le - KERNEL images/Fedora/30/ppc64le/vmlinuz - APPEND ks initrd=images/Fedora/30/ppc64le/initrd.img method=http://10.5.126.23/pub/fedora-secondary/releases/30/Server/ppc64le/os/ ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-fedora-30-power9le-08disk net.ifnames=0 ksdevice=bootif - -LABEL EL7-ppc64le-virthost - MENU LABEL EL7-ppc64le-virthost - KERNEL images/RHEL/7/ppc64le/vmlinuz - IPAPPEND 2 - APPEND ks initrd=images/RHEL/7/ppc64le/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-ppc64le/ ip=dhcp ksdevice=bootif ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-power8-LE-12disk text net.ifnames=0 biosdevname=0 - -LABEL EL7-aarch64-virthost - MENU LABEL EL7-aarch64-virthost - KERNEL images/RHEL/7/aarch64/vmlinuz - APPEND ks initrd=images/RHEL/7/aarch64/initrd.img method=http://10.5.126.23/repo/rhel/RHEL7-aarch64/ ip=dhcp ksdevice=bootif ks=http://10.5.126.23/repo/rhel/ks/hardware-rhel-7-moonshot text net.ifnames=0 biosdevname=0 - -MENU end diff --git a/roles/varnish/tasks/main.yml b/roles/varnish/tasks/main.yml index 6f5e383111..d08f7c8793 100644 --- a/roles/varnish/tasks/main.yml +++ b/roles/varnish/tasks/main.yml @@ -22,14 +22,6 @@ - varnish - selinux -- name: install varnish /etc/sysconfig/varnish file (el7) - copy: src=varnish.el7 dest=/etc/sysconfig/varnish owner=root group=root - notify: - - restart varnish - tags: - - varnish - when: ansible_distribution_major_version|int == 7 and ansible_distribution == 'RedHat' - - name: install varnish /etc/systemd/system/varnish.service file (fedora 29+) template: src=varnish.f29.j2 dest=/etc/systemd/system/varnish.service owner=root group=root notify: diff --git a/roles/virthost/files/rhel7-os.repo b/roles/virthost/files/rhel7-os.repo deleted file mode 100644 index f802cefbda..0000000000 --- a/roles/virthost/files/rhel7-os.repo +++ /dev/null @@ -1,5 +0,0 @@ -[rhel7-os] -name = rhel7 os $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openstack-10-rpms -includepkgs=qemu* -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/roles/virthost/files/rhel7-rhev-aarch64.repo b/roles/virthost/files/rhel7-rhev-aarch64.repo deleted file mode 100644 index d84100bbd7..0000000000 --- a/roles/virthost/files/rhel7-rhev-aarch64.repo +++ /dev/null @@ -1,6 +0,0 @@ -[rhel-7-server-rhv-4-aarch64] -name=rhel7 os $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-kvm-rpms -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -gpgcheck=1 diff --git a/roles/virthost/files/rhel7-rhev-ppc64le.repo b/roles/virthost/files/rhel7-rhev-ppc64le.repo deleted file mode 100644 index 09815f6771..0000000000 --- a/roles/virthost/files/rhel7-rhev-ppc64le.repo +++ /dev/null @@ -1,5 +0,0 @@ -[rhel7-os] -name = rhel7 os $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-rhv-4-mgmt-agent-for-power-le-rpms/ -includepkgs=qemu* -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release diff --git a/tasks/openvpn_client_7.yml b/tasks/openvpn_client_7.yml index e2e86506ce..15bd57755b 100644 --- a/tasks/openvpn_client_7.yml +++ b/tasks/openvpn_client_7.yml @@ -40,7 +40,7 @@ notify: - restart openvpn 7 -- name: enable openvpn service for rhel 7 or fedora +- name: enable openvpn service for rhel or fedora service: name=openvpn@openvpn state=started enabled=true tags: - service diff --git a/vars/global.yml b/vars/global.yml index b0e374a099..f28b7574af 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -9,51 +9,6 @@ tasks_path: /srv/web/infra/ansible/tasks vars_path: "/srv/web/infra/ansible/vars" dist_tag: unknown auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas' -# -# These are images in the old cloud using the ec2 interface -# -el6_qcow_id: ami-00000013 -f18_qcow_id: ami-00000016 -el6_ami_id: ami-0000000e -f17_qcow_id: ami-00000001 -# Fedora-19 -f19_qcow_id: ami-00000020 -# Fedora-20 -f20_qcow_id: ami-00000042 -# Fedora-21 -f21_qcow_id: ami-0000005a -# RHEL7beta -el7b_qcow_id: ami-0000003f -# RHEL7 -el7_qcow_id: ami-00000050 - -# -# These are the new images in the new cloud using the nova interface. -# -fedora20_x86_64: Fedora-x86_64-20-20140407 -fedora21_x86_64: Fedora-Cloud-Base-20141203-21.x86_64 -fedora22_alpha_x86_64: Fedora-Cloud-Base-22_Alpha-20150305.x86_64 -fedora22_beta_x86_64: Fedora-Cloud-Base-22_Beta-20150415.x86_64 -fedora22_x86_64: Fedora-Cloud-Base-22-20150521.x86_64 -fedora_atomic_22_alpha: Fedora-Cloud-Atomic-22_Alpha-20150305.x86_64 -fedora_atomic_22_beta: Fedora-Cloud-Atomic-22_Beta-20150415.x86_64 -fedora_atomic_22: Fedora-Cloud-Atomic-22-20150521.x86_64 -fedora23_x86_64: Fedora-Cloud-Base-23-20151030.x86_64 -fedora24_alpha_x86_64: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2 -fedora24_x86_64: Fedora-Cloud-Base-24-1.2.x86_64.qcow2 -fedora25_x86_64: Fedora-Cloud-Base-25-1.3.x86_64 -fedora26_x86_64: Fedora-Cloud-Base-26-1.4.x86_64 -fedora27_x86_64: Fedora-Cloud-Base-27-1.2.x86_64 -fedora28_x86_64: Fedora-Cloud-Base-28-1.1.x86_64 -fedora29_x86_64: Fedora-Cloud-Base-29-1.2.x86_64 -fedora30_beta_x86_64: Fedora-Cloud-Base-30-20190329.n.0.x86_64 -fedora30_x86_64: Fedora-Cloud-Base-30-1.2.x86_64 -fedora30_20190925_ppc64le: Fedora-Cloud-Base-30-20190925.0.ppc64le -centos70_x86_64: CentOS-7-x86_64-GenericCloud-1503 -centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01 -rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64 -rhel66_x86_64: rhel-guest-image-6.6-20141222.0.x86_64 -fedora31_x86_64: Fedora-Cloud-Base-31-1.9.x86_64 # Note: we do "+all -some" rather than "+some" to make sure we can use this # same list on both EL7 and Fedora and get new ciphers: on Fedora, at time of writing,