Merge "opensuse: use proper nodeset"

playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml

@@ -18,7 +18,6 @@ required_packages:
   - mariadb-server
   - dnsmasq
   - python-devel
-  - python-MySQL-python
   - python-iniparse
   - libffi-devel
   - libxslt-devel
@@ -32,10 +31,10 @@ required_packages:
   - psmisc
   - nginx
   - wget
-  - genisoimage
+  - mkisofs
   - kpartx
   - qemu-tools
-  - openwsman-python
+  - python3-openwsman
   - policycoreutils-python
   - debootstrap
   - dpkg

playbooks/roles/bifrost-ironic-install/defaults/required_defaults_openSUSE_Leap_15.0.yml

@@ -1,48 +0,0 @@
----
-init_template: systemd_template.j2
-init_dest_dir: /usr/lib/systemd/system/
-init_ext: .service
-# 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
-# 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/
-nginx_user: nginx
-mysql_service_name: mysql
-tftp_service_name: tftp
-required_packages:
-  - python-selinux
-  - mariadb-server
-  - dnsmasq
-  - python-devel
-  - python-iniparse
-  - libffi-devel
-  - libxslt-devel
-  - openssl-devel
-  - libxml2-devel
-  - qemu-ipxe
-  - tftp
-  - xinetd
-  - parted
-  - ipmitool
-  - psmisc
-  - nginx
-  - wget
-  - mkisofs
-  - kpartx
-  - qemu-tools
-  - python3-openwsman
-  - policycoreutils-python
-  - debootstrap
-  - dpkg
-  - iptables
-  - tar
-  - curl
-  - socat
-  - python-pip
-  - gcc
-  - python-PyMySQL
-iscsi_client_package: "open-iscsi"

zuul.d/legacy-bifrost-jobs.yaml

@@ -48,7 +48,7 @@
 - job:
     name: bifrost-integration-dhcp-opensuse-15
     parent: bifrost-integration-dhcp
-    nodeset: opensuse-150
+    nodeset: opensuse-15
     vars:
       use_venv: true
 
@@ -72,7 +72,7 @@
 - job:
     name: bifrost-integration-dibipa-debian-opensuse-15
     parent: bifrost-integration-dibipa-debian
-    nodeset: opensuse-150
+    nodeset: opensuse-15
     vars:
       use_venv: true
 
@@ -103,6 +103,6 @@
 - job:
     name: bifrost-integration-tinyipa-opensuse-15
     parent: bifrost-integration-tinyipa
-    nodeset: opensuse-150
+    nodeset: opensuse-15
     vars:
       use_venv: true