diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml index 44c649bde1..18d5153602 100644 --- a/playbooks/manual/ocp4-place-ignitionfiles.yml +++ b/playbooks/manual/ocp4-place-ignitionfiles.yml @@ -14,7 +14,7 @@ # nameservers: # - 192.168.1.1 # - 192.168.2.2 -# gateway +# gateway # deploy_host: # http server serving ignition files - hosts: os_control_stg:ocp_controlplane_stg:ocp_workers_stg:ocp_boostrap_stg:ocp_vms_stg user: root @@ -23,12 +23,12 @@ tasks: - block: - name: == OCP KVM provisioning == Ensuring we have needed httpd dir - file: + file: path: "/var/www/html/rhcos" state: directory mode: 0755 - name: == OCP KVM provisioning == Importing generated Ignition files - template: + template: src: "/srv/web/infra/bigfiles/openshiftboot/{{ env }}/{{ item }}" dest: "/var/www/html/rhcos/{{ item }}" mode: 0755 @@ -36,8 +36,8 @@ - bootstrap.ign - controlplane.ign - worker.ign - - name: == OCP KVM provisioning == Creating treeinfo for virt-install --location - template: + - name: == OCP KVM provisioning == Creating treeinfo for virt-install --location + template: src: "/srv/web/infra/bigfiles/openshiftboot/ocp-treeinfo.j2" dest: "/var/www/html/rhcos/.treeinfo" mode: 0644 @@ -82,17 +82,6 @@ - ignition - repo - - name: == Hardware provisioning == Generating the tftp configuration boot file - template: - src: ocp_pxeboot.j2 - dest: /srv/web/infra/bigfiles/tftpboot2/rhcos/{{ mac0 | lower | replace(":","-") }} - mode: 0755 - delegate_to: 127.0.0.1 - tags: - - ignition - - repo - when: inventory_hostname in groups['ocp_workers_stg'] - - name: == OCP KVM provisioning == Checking OCP Virtual Guest exist[s] virt: name: "{{ inventory_hostname }}" diff --git a/playbooks/manual/templates/ocp_pxeboot.j2 b/playbooks/manual/templates/ocp_pxeboot.j2 deleted file mode 100644 index 1365d1c9d8..0000000000 --- a/playbooks/manual/templates/ocp_pxeboot.j2 +++ /dev/null @@ -1,15 +0,0 @@ -DEFAULT {{ inventory_hostname }}-deploy -PROMPT 0 -TIMEOUT 50 -TOTALTIMEOUT 6000 -ONTIMEOUT {{ inventory_hostname }}-deploy - -LABEL local - MENU LABEL (local) - MENU DEFAULT - LOCALBOOT 0 - -LABEL {{ inventory_hostname}}-deploy - MENU LABEL RHCOS {{ rhcos_version }} {{ arch }}- Kickstart for {{ inventory_hostname }} - KERNEL {{ rhcos_kernel_url }} - APPEND ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:{{ pxe_bootdev }}:none nameserver={{ dns }} initrd={{ rhcos_initrd_url }} coreos.inst.install_dev={{ install_dev }} coreos.live.rootfs_url={{ rhcos_install_rootfs_url }} coreos.inst.ignition_url={{ rhcos_ignition_file_url }}