[BREAKING CHANGE] update for onedir salt package

saltstack-formulas · Jan 31, 2024 · 1e05928 · 1e05928
1 parent 3dc21ce
commit 1e05928
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 154 deletions.
diff --git a/libvirt/parameters/defaults.yaml b/libvirt/parameters/defaults.yaml
@@ -14,8 +14,7 @@ values:
       - id
   libvirt_pkg: libvirt
   qemu_pkg: qemu
-  python2_pkg: libvirt-python
-  python3_pkg: python3-libvirt
+  pip_pkg: libvirt-python
   libvirt_service: libvirtd
   libvirtd_config: /etc/libvirt/libvirtd.conf
   daemon_config_path: {}

diff --git a/libvirt/parameters/os/AlmaLinux.yaml b/libvirt/parameters/os/AlmaLinux.yaml
diff --git a/libvirt/parameters/os/CentOS.yaml b/libvirt/parameters/os/CentOS.yaml
diff --git a/libvirt/parameters/os/Fedora.yaml b/libvirt/parameters/os/Fedora.yaml
diff --git a/libvirt/parameters/os/Rocky.yaml b/libvirt/parameters/os/Rocky.yaml
diff --git a/libvirt/parameters/os_family/Arch.yaml b/libvirt/parameters/os_family/Arch.yaml
@@ -12,5 +12,6 @@
 values:
   daemon_config_path: /etc/conf.d
   qemu_pkg: qemu-full
-  python3_pkg: libvirt-python
+  extra_pkgs:
+    - pkgconf
 ...
diff --git a/libvirt/parameters/os_family/Debian.yaml b/libvirt/parameters/os_family/Debian.yaml
@@ -13,10 +13,11 @@ values:
   libvirt_pkg: libvirt-daemon-system
   libvirt_service: libvirtd
   qemu_pkg: qemu-system-x86
-  python2_pkg: python-libvirt
   extra_pkgs:
     - libguestfs0
     - libguestfs-tools
     - gnutls-bin
+    - libvirt-dev
+    - pkg-config
   daemon_config_path: /etc/default
 ...
diff --git a/libvirt/parameters/os_family/RedHat.yaml b/libvirt/parameters/os_family/RedHat.yaml
@@ -13,5 +13,7 @@ values:
   qemu_pkg: qemu-kvm
   extra_pkgs:
     - libguestfs
+    - libvirt-devel
+    - pkgconf
   daemon_config_path: /etc/sysconfig
 ...
diff --git a/libvirt/parameters/os_family/Suse.yaml b/libvirt/parameters/os_family/Suse.yaml
@@ -14,7 +14,7 @@ values:
   qemu_pkg: qemu-kvm
   extra_pkgs:
     - libguestfs0
-  python2_pkg: python2-libvirt-python
-  python3_pkg: python3-libvirt-python
+    - libvirt-devel
+    - pkg-config
   daemon_config_path: /etc/sysconfig
 ...
diff --git a/libvirt/parameters/oscodename/openSUSE Tumbleweed.yaml b/libvirt/parameters/oscodename/openSUSE Tumbleweed.yaml
diff --git a/libvirt/parameters/osfinger/CentOS Linux-7.yaml b/libvirt/parameters/osfinger/CentOS Linux-7.yaml
diff --git a/libvirt/python.jinja b/libvirt/python.jinja
diff --git a/libvirt/python/clean.sls b/libvirt/python/clean.sls
@@ -4,13 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as libvirt_settings with context %}
-{%- from tplroot ~ "/python.jinja" import switch_python32 with context %}
 
-{%- set package = switch_python32(libvirt_settings.python3_pkg, libvirt_settings.python2_pkg) %}
-
-{#- Some OS do not have the python3 library #}
-{%- if package %}
 libvirt-python-clean-pkg-removed:
-  pkg.removed:
-    - name: {{ package }}
-{%- endif %}
+  pip.uninstalled:
+    - name: {{ libvirt_settings.pip_pkg }}
diff --git a/libvirt/python/install.sls b/libvirt/python/install.sls
@@ -4,13 +4,10 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as libvirt_settings with context %}
-{%- from tplroot ~ "/python.jinja" import switch_python32 with context %}
 
-{%- set package = switch_python32(libvirt_settings.python3_pkg, libvirt_settings.python2_pkg) %}
-
-{#- Some OS do not have the python3 library #}
-{%- if package %}
 libvirt-python-install-pkg-installed:
-  pkg.installed:
-    - name: {{ package }}
-{%- endif %}
+  pip.installed:
+    - name: {{ libvirt_settings.pip_pkg }}
+    - require:
+      - pkg: libvirt-extra-install-pkg-installed
+
diff --git a/libvirt/server/tls/certs.sls b/libvirt/server/tls/certs.sls
@@ -6,26 +6,16 @@
 {%- set sls_python = tplroot ~ '.python' %}
 {%- set sls_server_config = tplroot ~ '.server.config' %}
 {%- from tplroot ~ "/map.jinja" import mapdata as libvirt_settings with context %}
-{%- from tplroot ~ "/python.jinja" import switch_python32 with context %}
 
-{%- set package = switch_python32(libvirt_settings.python3_pkg, libvirt_settings.python2_pkg) %}
 {%- set salt_version = salt['grains.get']('saltversioninfo', '') %}
 
-{#- Some OS do not have the python3 library #}
-{%- if package %}
 include:
   - {{ sls_python }}
   - {{ sls_server_config }}
 
 libvirt-server-tls-certs-virt-keys:
-# API changes with version 2016.3.0
-{%- if salt_version[0]|int < 2016 or (salt_version[0]|int == 2016 and salt_version[1]|int <= 3) %}
-  libvirt.keys:
-{%- else %}
   virt.keys:
-{%- endif %}
     - name: libvirt_keys
     - require:
       - pkg: libvirt-server-package-install-pkg-installed
-      - pkg: libvirt-python-install-pkg-installed
-{%- endif %}
+      - pip: {{ libvirt_settings.pip_pkg }}