From 52adb249589e1964a90e3bc2f1ffd88357fb9bb5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 5 Sep 2019 17:37:23 +0200
Subject: [PATCH] opensuse: use proper nodeset

Also convert to the right set of packages and sort
the list alphabetically: High level changes are:

- switch to python 3.x
- switch to mkisofs, genisoimage was dropped

Change-Id: I17d36a2d36c941c5b5e3b5a40e42315caf275da4
---
 .../required_defaults_Suse_family.yml         |  5 +-
 .../required_defaults_openSUSE_Leap_15.0.yml  | 48 -------------------
 zuul.d/legacy-bifrost-jobs.yaml               |  6 +--
 3 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 playbooks/roles/bifrost-ironic-install/defaults/required_defaults_openSUSE_Leap_15.0.yml

diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
index 19fc66a2f..845de1286 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Suse_family.yml
+++ b/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
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_openSUSE_Leap_15.0.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_openSUSE_Leap_15.0.yml
deleted file mode 100644
index 845de1286..000000000
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_openSUSE_Leap_15.0.yml
+++ /dev/null
@@ -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"
diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml
index b50a26dfc..8995b88b2 100644
--- a/zuul.d/legacy-bifrost-jobs.yaml
+++ b/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