Use packaged iPXE ROMs for openSUSE

Also remove work arounds for openSUSE in ancient ansible versions.

Change-Id: Iab8dbf538b2e1bfc79d1021c6a7f729832abb3a5
This commit is contained in:
Dmitry Tantsur 2020-08-25 12:27:18 +02:00
parent 1d5f0bbdc7
commit ea4ee59550
4 changed files with 9 additions and 39 deletions

View File

@ -12,22 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
# NOTE(cinerama) openSUSE Tumbleweed & Leap have different distribution
# IDs which are not currently accounted for in Ansible, so adjust facts
# so we can have shared defaults for the whole SuSE family.
# This change can be removed when the pull request at
# https://github.com/ansible/ansible/pull/17575 lands in a new version.
- name: Ensure openSUSE Tumbleweed has the correct family
set_fact:
ansible_os_family: "Suse"
when: ansible_os_family is search("openSUSE Tumbleweed")
- name: Ensure openSUSE Leap has the correct family
set_fact:
ansible_os_family: "Suse"
when: (ansible_os_family is search("SUSE LINUX")) or
(ansible_os_family is search("openSUSE Leap"))
# NOTE(hwoarang) The 'apt' module needs python-apt installed in the virtualenv # NOTE(hwoarang) The 'apt' module needs python-apt installed in the virtualenv
# but it's not possible to do that. See https://github.com/ansible/ansible/issues/14468 # but it's not possible to do that. See https://github.com/ansible/ansible/issues/14468
# python-apt only works if it's installed on the local system so we need to switch the # python-apt only works if it's installed on the local system so we need to switch the

View File

@ -1,12 +1,8 @@
--- ---
init_dest_dir: /usr/lib/systemd/system/ init_dest_dir: /usr/lib/systemd/system/
# NOTE (cinerama): The iPXE binaries are not currently packaged for SuSE, ipxe_dir: /usr/share/ipxe
# so we download them and install them to /usr/local/share/ipxe. If the ipxe_full_binary: ipxe.lkrn
# files are packaged, download_ipxe can be removed and ipxe_dir set to ipxe_efi_binary: ipxe-x86_64.efi
# the location of the packaged files.
download_ipxe: true
ipxe_dir: /usr/local/share/ipxe
ipxe_full_binary: ipxe.pxe
ironic_rootwrap_dir: /usr/bin/ ironic_rootwrap_dir: /usr/bin/
nginx_user: nginx nginx_user: nginx
mysql_service_name: mysql mysql_service_name: mysql
@ -21,6 +17,7 @@ required_packages:
- libxslt-devel - libxslt-devel
- openssl-devel - openssl-devel
- libxml2-devel - libxml2-devel
- ipxe-bootimgs
- qemu-ipxe - qemu-ipxe
- tftp - tftp
- xinetd - xinetd

View File

@ -13,22 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
# NOTE(cinerama) openSUSE Tumbleweed & Leap have different distribution
# IDs which are not currently accounted for in Ansible, so adjust facts
# so we can have shared defaults for the whole SuSE family.
# This change can be removed when the pull request at
# https://github.com/ansible/ansible/pull/17575 lands in a new version.
- name: Ensure openSUSE Tumbleweed has the correct family
set_fact:
ansible_os_family: "Suse"
when: ansible_os_family is search("openSUSE Tumbleweed")
- name: Ensure openSUSE Leap has the correct family
set_fact:
ansible_os_family: "Suse"
when: (ansible_os_family is search("SUSE LINUX")) or
(ansible_os_family is search("openSUSE Leap"))
# NOTE(cinerama) dummy-defaults.yml is an empty defaults file. We use it # NOTE(cinerama) dummy-defaults.yml is an empty defaults file. We use it
# here to ensure that with_first_found won't fail should we not have # here to ensure that with_first_found won't fail should we not have
# defaults for a particular distribution, version, etc. # defaults for a particular distribution, version, etc.

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Packaged iPXE ROMs are now used by default on openSUSE, set
``download_ipxe=true`` to override.