openstack/bifrost
Code Issues Proposed changes

Merge "Remove syslinux usage"

Browse Source
This commit is contained in:
Zuul 2018-07-20 17:30:37 +00:00 committed by Gerrit Code Review
commit 519d43c137
11 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
View File

@ -2,7 +2,6 @@
init_template: upstart_template.j2
init_dest_dir: /etc/init/
init_ext: .conf
syslinux_tftp_dir: /usr/lib/syslinux/
ipxe_dir: /usr/lib/ipxe/
ipxe_full_binary: ipxe.pxe
ironic_rootwrap_dir: /usr/local/bin/
@ -22,8 +21,6 @@ required_packages:
- ipxe
- tftpd-hpa
- tftp-hpa
- syslinux-common
- syslinux
- xinetd
- parted
- ipmitool

4
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_jessie.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /usr/lib/PXELINUX/
ipxe_dir: /usr/lib/ipxe/
ipxe_full_binary: ipxe.pxe
nginx_user: www-data
@ -20,9 +19,6 @@ required_packages:
- ipxe
- tftpd-hpa
- tftp-hpa
- syslinux-common
- syslinux
- pxelinux
- xinetd
- parted
- ipmitool

3
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_25.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
ironic_rootwrap_dir: /usr/bin/
@ -23,8 +22,6 @@ required_packages:
- libxml2-devel
- ipxe-bootimgs
- tftp-server
- syslinux
- syslinux-tftpboot
- xinetd
- parted
- ipmitool

3
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_26.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
ironic_rootwrap_dir: /usr/bin/
@ -23,8 +22,6 @@ required_packages:
- libxml2-devel
- ipxe-bootimgs
- tftp-server
- syslinux
- syslinux-tftpboot
- xinetd
- parted
- ipmitool

3
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Fedora_27.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
ironic_rootwrap_dir: /usr/bin/
@ -23,8 +22,6 @@ required_packages:
- libxml2-devel
- ipxe-bootimgs
- tftp-server
- syslinux
- syslinux-tftpboot
- xinetd
- parted
- ipmitool

3
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
ironic_rootwrap_dir: /usr/bin/
@ -22,8 +21,6 @@ required_packages:
- libxml2-devel
- ipxe-bootimgs
- tftp-server
- syslinux
- syslinux-tftpboot
- xinetd
- parted
- ipmitool

2
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /usr/share/syslinux
# NOTE (cinerama): The iPXE binaries are not currently packaged for SuSE,
# so we download them and install them to /usr/local/share/ipxe. If the
# files are packaged, download_ipxe can be removed and ipxe_dir set to
@ -28,7 +27,6 @@ required_packages:
- libxml2-devel
- qemu-ipxe
- tftp
- syslinux
- xinetd
- parted
- ipmitool

2
playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml
View File

@ -15,8 +15,6 @@ required_packages:
- ipxe
- tftpd-hpa
- tftp-hpa
- syslinux-common
- syslinux
- xinetd
- parted
- ipmitool

17
playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
View File

@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
# TODO(TheJulia): The pxelinux folder is statically coded in ironic.
# For now, we need to use it, but we can patch that.
- name: "Set up PXE and iPXE folders"
file: name={{item}} owner=ironic group=ironic state=directory mode=0755
with_items:
@ -27,19 +29,6 @@
- name: "Disable service {{ tftp_service_name }}"
service: name="{{ tftp_service_name }}" state=stopped enabled=no
- name: "Set pxelinux.0 source (for Ubuntu >=14.10)"
set_fact:
syslinux_tftp_dir: '/usr/lib/PXELINUX'
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('14.10', '>=')
- name: "Determine if pxelinux.0 is in place"
stat: path=/tftpboot/pxelinux.0
register: test_pxelinux
- name: "Place pxelinux.0"
copy: src={{ syslinux_tftp_dir }}/pxelinux.0 dest=/tftpboot remote_src=true
when: test_pxelinux.stat.exists == false
- name: "Place boot.ipxe helper script /etc/ironic"
copy: src=boot.ipxe dest=/etc/ironic/boot.ipxe owner=ironic group=ironic mode=0744
@ -72,6 +61,8 @@
file: name="{{ ironic_tftp_master_path }}" state=directory owner=ironic group=ironic
when: test_master_images.stat.exists == false
# TODO(TheJulia): The pxelinux folder is statically coded in ironic.
# For now, we need to use it, but we can patch that.
- name: "Inspector - Place default tftp boot file in {{ http_boot_folder}}/pxelinux.cfg/"
template:
src=inspector-default-boot-ipxe.j2

9
playbooks/roles/bifrost-ironic-install/tasks/install.yml
View File

@ -21,15 +21,6 @@
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
with_items: "{{ required_packages }}"
# Step required for Ubuntu 14.10
- name: "Install Ubuntu 14.10 (and later) packages"
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
with_items:
- pxelinux
when: >
ansible_distribution_version|version_compare('14.10', '>=') and
ansible_distribution == 'Ubuntu'
- name: "If running in CI, set source install facts just to be sure"
set_fact:
shade_source_install: true

1
playbooks/roles/bifrost-keystone-install/defaults/required_defaults_RedHat_family.yml
View File

@ -2,7 +2,6 @@
init_template: systemd_template.j2
init_dest_dir: /usr/lib/systemd/system/
init_ext: .service
syslinux_tftp_dir: /var/lib/tftpboot
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
sgabios_dir: /usr/share/sgabios/