diff --git a/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml b/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml index 012b233f7c..47e23b5264 100644 --- a/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc-os01.rdu-cc.fedoraproject.org.yml @@ -30,6 +30,13 @@ - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" + - name: install some packages which arent in playbooks + package: + state: present + name: + - nmap + - tcpdump + - name: check if ntpd port is already known by selinux shell: semanage port -l | grep ntp register: ntp_selinux_port diff --git a/roles/tftp_server/files/default.cloud-noc01.fedorainfracloud.org b/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org similarity index 57% rename from roles/tftp_server/files/default.cloud-noc01.fedorainfracloud.org rename to roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org index 4bb5659ba9..5a7e6769a9 100644 --- a/roles/tftp_server/files/default.cloud-noc01.fedorainfracloud.org +++ b/roles/tftp_server/files/default.cloud-noc-os01.rdu-cc.fedoraproject.org @@ -1,5 +1,5 @@ DEFAULT menu -MENU TITLE Fedora Infra Cloud PXE Boot +MENU TITLE Fedora Infra RDU_CC PXE Boot PROMPT 0 TIMEOUT 200 TOTALTIMEOUT 6000 @@ -13,31 +13,31 @@ LABEL local LABEL cloud-fx MENU LABEL cloud-fx KERNEL images/RHEL/7/x86_64/vmlinuz - APPEND initrd=images/RHEL/7/x86_64/initrd.img method=http://209.132.181.6/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://209.132.181.6/repo/rhel/ks/hardware-rhel-7-cloud-fx net.ifnames=0 biosdevname=0 + 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://209.132.181.6/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://209.132.181.6/repo/rhel/ks/hardware-rhel-7-08disk-ext net.ifnames=0 biosdevname=0 + 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://209.132.181.6/repo/rhel/RHEL7-x86_64/ ip=dhcp net.ifnames=0 biosdevname=0 rescue + 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://209.132.181.6/repo/rhel/RHEL7-x86_64/ ip=dhcp ks=http://209.132.181.6/repo/rhel/ks/hardware-rhel-7-nohd net.ifnames=0 biosdevname=0 + 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 - APPEND initrd=images/RHEL/8/ppx64le/initrd.img method=http://209.132.181.6/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://209.132.181.6/repo/rhel/ks/hardware-rhel-8-nohd-ppc64le net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/8/ppx64le/initrd.img method=http://38.145.60.16/repo/rhel/RHEL8-ppc64le/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-8-nohd-ppc64le net.ifnames=0 biosdevname=0 LABEL EL-8-10hd-x86_64 MENU LABEL el810hdx86 KERNEL images/RHEL/8/x86_64/vmlinuz - APPEND initrd=images/RHEL/8/x86_64/initrd.img method=http://209.132.181.6/repo/rhel/RHEL8-x86_64/ ip=dhcp ks=http://209.132.181.6/repo/rhel/ks/hardware-rhel-8-x86_64-10disk-ext net.ifnames=0 biosdevname=0 + APPEND initrd=images/RHEL/8/x86_64/initrd.img method=http://38.145.60.16/repo/rhel/RHEL8-x86_64/ ip=dhcp ks=http://38.145.60.16/repo/rhel/ks/hardware-rhel-8-x86_64-10disk-ext net.ifnames=0 biosdevname=0 MENU end diff --git a/roles/tftp_server/files/highbank.cloud-noc01.fedorainfracloud.org b/roles/tftp_server/files/highbank.cloud-noc01.fedorainfracloud.org deleted file mode 100644 index 5c0aae7f5c..0000000000 --- a/roles/tftp_server/files/highbank.cloud-noc01.fedorainfracloud.org +++ /dev/null @@ -1,20 +0,0 @@ -DEFAULT menu -MENU TITLE Fedora Infrastructure arm highbank PXE Boot -PROMPT 0 -TIMEOUT 200 -TOTALTIMEOUT 6000 -ONTIMEOUT Fedora26 - -LABEL Fedora26 - MENU LABEL Fedora26 - KERNEL images/Fedora/26/armv7/vmlinuz - INITRD images/Fedora/26/armv7/initrd.img - APPEND console=ttyAMA0 ip=eth0:dhcp ks=http://209.132.181.6/repo/rhel/ks/armv7hfp-highbank-26-cloud.ks rd.shell quiet - -LABEL Fedora25 - MENU LABEL Fedora25 - KERNEL images/Fedora/25/armv7/vmlinuz - INITRD images/Fedora/26/armv7/initrd.img - APPEND console=ttyAMA0 ip=eth0:dhcp ks=http://209.132.181.6/repo/rhel/ks/armv7hfp-highbank-25-cloud.ks rd.shell quiet - -MENU end diff --git a/roles/tftp_server/files/highbank.dhcp01.phx2.fedoraproject.org b/roles/tftp_server/files/highbank.dhcp01.phx2.fedoraproject.org deleted file mode 100644 index bad224be1e..0000000000 --- a/roles/tftp_server/files/highbank.dhcp01.phx2.fedoraproject.org +++ /dev/null @@ -1,20 +0,0 @@ -DEFAULT menu -MENU TITLE Fedora Infrastructure arm highbank PXE Boot -PROMPT 0 -TIMEOUT 200 -TOTALTIMEOUT 6000 -ONTIMEOUT Fedora26 - -LABEL Fedora26 - MENU LABEL Fedora26 - KERNEL images/Fedora/26/armv7/vmlinuz - INITRD images/Fedora/26/armv7/initrd.img - APPEND console=ttyAMA0 ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/armv7hfp-highbank-26.ks rd.shell quiet - -LABEL Fedora25 - MENU LABEL Fedora25 - KERNEL images/Fedora/25/armv7/vmlinuz - INITRD images/Fedora/26/armv7/initrd.img - APPEND console=ttyAMA0 ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/armv7hfp-highbank-25.ks rd.shell quiet - -MENU end diff --git a/roles/tftp_server/files/highbank.noc01.phx2.fedoraproject.org b/roles/tftp_server/files/highbank.noc01.phx2.fedoraproject.org deleted file mode 100644 index bad224be1e..0000000000 --- a/roles/tftp_server/files/highbank.noc01.phx2.fedoraproject.org +++ /dev/null @@ -1,20 +0,0 @@ -DEFAULT menu -MENU TITLE Fedora Infrastructure arm highbank PXE Boot -PROMPT 0 -TIMEOUT 200 -TOTALTIMEOUT 6000 -ONTIMEOUT Fedora26 - -LABEL Fedora26 - MENU LABEL Fedora26 - KERNEL images/Fedora/26/armv7/vmlinuz - INITRD images/Fedora/26/armv7/initrd.img - APPEND console=ttyAMA0 ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/armv7hfp-highbank-26.ks rd.shell quiet - -LABEL Fedora25 - MENU LABEL Fedora25 - KERNEL images/Fedora/25/armv7/vmlinuz - INITRD images/Fedora/26/armv7/initrd.img - APPEND console=ttyAMA0 ip=eth0:dhcp ks=http://10.5.126.23/repo/rhel/ks/armv7hfp-highbank-25.ks rd.shell quiet - -MENU end diff --git a/roles/tftp_server/tasks/main.yml b/roles/tftp_server/tasks/main.yml index fd96c16f75..75a471a29e 100644 --- a/roles/tftp_server/tasks/main.yml +++ b/roles/tftp_server/tasks/main.yml @@ -24,13 +24,6 @@ - tftp_server when: datacenter != 'iad2' -- name: setup highbank default file - copy: src=highbank.{{ inventory_hostname }} dest=/var/lib/tftpboot/pxelinux.cfg/default-arm-highbank mode=644 - tags: - - config - - tftp_server - when: datacenter != 'iad2' - - name: enable tftp socket service service: state=started enabled=true name=tftp.socket tags: