openstack-image-manager 0.20231212.0__tar.gz → 0.20240211.0__tar.gz

{openstack-image-manager-0.20231212.0/openstack_image_manager.egg-info → openstack-image-manager-0.20240211.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20231212.0
+Version: 0.20240211.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License:                                  Apache License
@@ -223,14 +223,14 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: loguru==0.7.2
-Requires-Dist: minio==7.2.0
+Requires-Dist: minio==7.2.3
 Requires-Dist: munch==4.0.0
 Requires-Dist: natsort==8.4.0
-Requires-Dist: openstacksdk==2.0.0
-Requires-Dist: paramiko==3.3.1
+Requires-Dist: openstacksdk==2.1.0
+Requires-Dist: paramiko==3.4.0
 Requires-Dist: patool==1.15.0
 Requires-Dist: requests==2.31.0
-Requires-Dist: ruamel.yaml==0.18.5
+Requires-Dist: ruamel.yaml==0.18.6
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: typer[all]==0.9.0
 Requires-Dist: yamale==4.0.4

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/centos.yml

@@ -23,11 +23,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud.centos.org/centos/7/images/sha256sum.txt
-    latest_url: 
+    latest_url:
       https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-HEREBE\d+\.qcow2$DRAGONS
     versions:
       - version: '20221112'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/centos-7/20221112-centos-7.qcow2
         checksum: sha256:284aab2b23d91318f169ff464bce4d53404a15a0618ceb34562838c59af4adea
         build_date: 2022-11-12
@@ -54,14 +54,14 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud.centos.org/centos/8-stream/x86_64/images/CHECKSUM
-    latest_url: 
+    latest_url:
       https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-HEREBE\d+\.\dDRAGONS.x86_64.qcow2
     versions:
-      - version: '20231128'
-        url: 
-          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/centos-stream-8/20231128-centos-stream-8.qcow2
-        checksum: sha256:1ef05cc240dd41ef7a02906236bc4f0230dc701c474bb67b0e7c333ea2c01e71
-        build_date: 2023-11-28
+      - version: '20240102'
+        url:
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/centos-stream-8/20240102-centos-stream-8.qcow2
+        checksum: sha256:0a0df996a5d90a7fd7a8100f11d874c6cf38aa93c9c2df97a5ca09269bb3d099
+        build_date: 2024-01-02
   - name: CentOS Stream 9
     enable: true
     shortname: centos-stream-9
@@ -85,11 +85,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud.centos.org/centos/9-stream/x86_64/images/CHECKSUM
-    latest_url: 
+    latest_url:
       https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-HEREBE\d+\.\dDRAGONS.x86_64.qcow2
     versions:
-      - version: '20231205'
-        url: 
-          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/centos-stream-9/20231205-centos-stream-9.qcow2
-        checksum: sha256:233746d874702d00d202b8ac95f6dc881cd5e2b96cec2ed638c9b9faa42198a5
-        build_date: 2023-12-05
+      - version: '20240102'
+        url:
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/centos-stream-9/20240102-centos-stream-9.qcow2
+        checksum: sha256:983ec6415576be43cb27eeca651cb44f820f68e74e45e764c320c3a54e626baa
+        build_date: 2024-01-02

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/cirros.yml

@@ -31,3 +31,7 @@ images:
         url: https://github.com/cirros-dev/cirros/releases/download/0.6.1/cirros-0.6.1-x86_64-disk.img
         checksum: "sha256:cc704ab14342c1c8a8d91b66a7fc611d921c8b8f1aaf4695f9d6463d913fa8d1"
         build_date: 2022-11-22
+      - version: '0.6.2'
+        url: https://github.com/cirros-dev/cirros/releases/download/0.6.2/cirros-0.6.2-x86_64-disk.img
+        checksum: "sha256:07e44a73e54c94d988028515403c1ed762055e01b83a767edf3c2b387f78ce00"
+        build_date: 2023-05-30

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/debian.yml

@@ -23,15 +23,15 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cdimage.debian.org/cdimage/cloud/buster/latest/SHA512SUMS
-    latest_url: 
+    latest_url:
       https://cdimage.debian.org/cdimage/cloud/buster/latest/debian-10-genericcloud-amd64.qcow2
     versions:
-      - version: '20230917'
-        url: 
-          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/debian-10/20230917-debian-10.qcow2
-        checksum: 
-          sha512:5bafe5851a38fe3a00853ee3c3203d5444c05cf81d1e04ac4a5c04500ab45cbd346a3e23aa138d93b4d13de2c0d4cfa7b4d622554d4e5e198817911f2bbd664b
-        build_date: 2023-09-17
+      - version: '20231228'
+        url:
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/debian-10/20231228-debian-10.qcow2
+        checksum:
+          sha512:99afc3b807ec76a4f1208da3bb95b8e64bb7f5d1b8a7c816ee1e6b90334153ba846c9fa14e3c99545aa77c81754a48681f11ea23860d909d936a37bb4dec9c27
+        build_date: 2023-12-28
   - name: Debian 11
     enable: true
     shortname: debian-11
@@ -54,15 +54,15 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cdimage.debian.org/cdimage/cloud/bullseye/latest/SHA512SUMS
-    latest_url: 
+    latest_url:
       https://cdimage.debian.org/cdimage/cloud/bullseye/latest/debian-11-genericcloud-amd64.qcow2
     versions:
-      - version: '20231013'
-        url: 
-          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/debian-11/20231013-debian-11.qcow2
-        checksum: 
-          sha512:651051664551425a1b731d5cb90cee33819ab8a3f955780efdb5e7045b057ec350345993a673f23a75c30aa2cb41409d0b6b5222a4f930028beaaa3c052ec0ec
-        build_date: 2023-10-13
+      - version: '20240104'
+        url:
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/debian-11/20240104-debian-11.qcow2
+        checksum:
+          sha512:01f1a9aa92f6257936193359642d7ff780ad3c721f4b731ed0a04684f015db66d7919a72b2b2a272a7dd3cf0e4e0314694c00684c333552a01bd149a535f2a09
+        build_date: 2024-01-04
   - name: Debian 12
     enable: true
     shortname: debian-12
@@ -85,12 +85,12 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cdimage.debian.org/cdimage/cloud/bookworm/daily/latest/SHA512SUMS
-    latest_url: 
+    latest_url:
       https://cdimage.debian.org/cdimage/cloud/bookworm/daily/latest/debian-12-genericcloud-amd64-daily.qcow2
     versions:
-      - build_date: 2023-12-11
-        checksum: 
-          sha512:75a0f88e1306057f2208c508d8c2e60a715f7f831d151d6509f305598aad56019d0c3869fcd4a2a8004afbd9d0832cf700d918fb24d351dc0e5b4c9bdcf2d482
-        url: 
-          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/debian-12/20231211-debian-12.qcow2
-        version: '20231211'
+      - build_date: 2024-01-09
+        checksum:
+          sha512:0092b56a72f1ace99c92dcbf7ed67331af107a8b94cfd5afc1a07c6e71facf292540b643f49bf847e1a7d159f36b78907942710e181680479adf67d366118667
+        url:
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/debian-12/20240109-debian-12.qcow2
+        version: '20240109'

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/flatcar.yml

@@ -28,3 +28,8 @@ images:
         source: https://stable.release.flatcar-linux.net/amd64-usr/3227.2.4/flatcar_production_openstack_image.img.bz2
         checksum: "sha256:774a4fd77da47a7c91714e6424891d6887ed7b9b72daadc40d56bb2f7527b4f5"
         build_date: 2022-10-27
+      - version: '3602.2.3'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/flatcar/3602.2.3/flatcar_production_openstack_image.img
+        source: https://stable.release.flatcar-linux.net/amd64-usr/3602.2.3/flatcar_production_openstack_image.img
+        checksum: "sha256:23b2d10aa0adf53d58bca0d9664338bdd308bef9e56f8393d39cb5e22bff4409"
+        build_date: 2023-12-11

openstack-image-manager-0.20240211.0/etc/images/gardenlinux.yml

@@ -0,0 +1,33 @@
+---
+images:
+  - name: Garden Linux
+    enable: true
+    shortname: gardenlinux
+    format: qcow2
+    login: admin
+    min_disk: 10
+    min_ram: 512
+    status: active
+    visibility: public
+    multi: false
+    meta:
+      architecture: x86_64
+      hw_disk_bus: virtio
+      hw_rng_model: virtio
+      hw_scsi_model: virtio-scsi
+      hw_watchdog_action: reset
+      os_distro: debian
+      replace_frequency: never
+      uuid_validity: none
+      provided_until: none
+    tags: []
+    versions:
+      - version: '934.11'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.11.qcow2
+        checksum: "sha256:616a217afe692ba8b6a9eca3a99291414b77a819c18430e6cba1b01a7ba6238b"
+        build_date: 2023-10-25
+      - version: '1312.1'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/gardenlinux/1312.1/openstack-gardener_prod-amd64-1312.1-c6ebc74e.qcow2
+        source: https://github.com/gardenlinux/gardenlinux/releases/download/1312.1/openstack-gardener_prod-amd64-1312.1-c6ebc74e.tar.xz
+        checksum: "sha256:12a67458959dabd8c4fa38f0224aa37f8e18629c218bbb716f411575a068663c"
+        build_date: 2023-11-22

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/kubernetes.yml

@@ -34,3 +34,7 @@ images:
         url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.28/ubuntu-2204-kube-v1.28.4.qcow2
         checksum: "sha256:ad9cb2fd07c0b9bd25e5476cc8daf0e9037f1b9d0bfef95ce2346f18f03bf58c"
         build_date: 2023-11-16
+      - version: '1.29.0'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.29/ubuntu-2204-kube-v1.29.0.qcow2
+        checksum: "sha256:d6576f6f920e84070f86a67ca9b6b6c7e48b2baff32fde70840e3f7df09b87c4"
+        build_date: 2023-12-18

openstack-image-manager-0.20240211.0/etc/images/osism.yml

@@ -0,0 +1,30 @@
+---
+images:
+  - name: OSISM CI
+    enable: false
+    shortname: osism-ci
+    format: qcow2
+    login: ubuntu
+    min_disk: 8
+    min_ram: 512
+    status: active
+    visibility: public
+    multi: true
+    meta:
+      architecture: x86_64
+      hw_disk_bus: scsi
+      hw_rng_model: virtio
+      hw_scsi_model: virtio-scsi
+      hw_watchdog_action: reset
+      os_distro: ubuntu
+      os_version: '22.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    versions:
+      - version: '20231221'
+        url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/osism-ci-image/osism-ci-image.qcow2
+        checksum: sha256:c736498ac352fb8a8c9825a56270363bea6e9dfcfc805ff1017cc0ec9e382f83
+        build_date: 2023-12-21

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/talos.yml

@@ -33,3 +33,8 @@ images:
         source: https://github.com/siderolabs/talos/releases/download/v1.4.5/openstack-amd64.tar.gz
         checksum: "sha256:fc7dc71a6acece93196c8bace15139469b7bfbe4fa7d001336da0fdda9b437c9"
         build_date: 2023-05-30
+      - version: '1.6.0'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/talos/1.6.0/openstack-amd64.raw
+        source: https://github.com/siderolabs/talos/releases/download/v1.6.0/openstack-amd64.raw.xz
+        checksum: "sha256:e3754c2338b4ce831db5442cf62deab260d56b64227a07cfc26e4b73eef5abaf"
+        build_date: 2023-12-15

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/etc/images/ubuntu.yml

@@ -23,11 +23,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud-images.ubuntu.com/trusty/current/SHA256SUMS
-    latest_url: 
+    latest_url:
       https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
     versions:
       - version: '20191107'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-14.04/20191107-ubuntu-14.04.qcow2
         checksum: sha256:3c4ad0defbe729dd3c16d2851d775575d1c5351c85734418d3b89bfdfd28ebd1
         build_date: 2019-11-07
@@ -54,11 +54,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud-images.ubuntu.com/xenial/current/SHA256SUMS
-    latest_url: 
+    latest_url:
       https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
     versions:
       - version: '20211001'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-16.04/20211001-ubuntu-16.04.qcow2
         checksum: sha256:fff2494a70bcaffb59f26f71ec49e137dd87d319341c35832dbe0ea65ff15140
         build_date: 2021-10-01
@@ -85,11 +85,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/xenial/release/SHA256SUMS
-    latest_url: 
+    latest_url:
       https://cloud-images.ubuntu.com/minimal/releases/xenial/release/ubuntu-16.04-minimal-cloudimg-amd64-disk1.img
     versions:
       - version: '20210929'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-16.04-minimal/20210929-ubuntu-16.04-minimal.qcow2
         checksum: sha256:7658ec30373e7ad1a1858744f395a89713d333721d7d1986ee8b71680b81a0a9
         build_date: 2021-09-20
@@ -119,7 +119,7 @@ images:
     latest_url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
     versions:
       - version: '20230607'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-18.04/20230607-ubuntu-18.04.qcow2
         checksum: sha256:8dd2e6b5e5aad20c3f836123b300cba9861249408cbb07c359145a65d6bab6b6
         build_date: 2023-06-07
@@ -146,11 +146,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/bionic/release/SHA256SUMS
-    latest_url: 
+    latest_url:
       https://cloud-images.ubuntu.com/minimal/releases/bionic/release/ubuntu-18.04-minimal-cloudimg-amd64.img
     versions:
       - version: '20230602'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-18.04-minimal/20230602-ubuntu-18.04-minimal.qcow2
         checksum: sha256:2d9755669c499e88d51da0638cd20e0983a248828e2153906c013bea0ee2f45a
         build_date: 2023-06-02
@@ -180,7 +180,7 @@ images:
     latest_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
     versions:
       - version: '20231207'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-20.04/20231207-ubuntu-20.04.qcow2
         checksum: sha256:2b9d7a5caea114fa202614ddb8e5d3b947e42b070252072d502c396483af5bcf
         build_date: 2023-12-07
@@ -207,11 +207,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/focal/release/SHA256SUMS
-    latest_url: 
+    latest_url:
       https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
     versions:
       - version: '20231208'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-20.04-minimal/20231208-ubuntu-20.04-minimal.qcow2
         checksum: sha256:42fc7f41eaeae416e949f6caa43385153ebee7c7e40bdcf6ed15a0f530cd8536
         build_date: 2023-12-08
@@ -240,11 +240,11 @@ images:
     latest_checksum_url: https://cloud-images.ubuntu.com/jammy/current/SHA256SUMS
     latest_url: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
     versions:
-      - version: '20231211'
-        url: 
-          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-22.04/20231211-ubuntu-22.04.qcow2
-        checksum: sha256:6d6af17f28c895d87e29092725370387c5e19efe57e58b96dc574feed4245f89
-        build_date: 2023-12-11
+      - version: '20240109'
+        url:
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-22.04/20240109-ubuntu-22.04.qcow2
+        checksum: sha256:005779fd27d1704af137820b69bfc4f98651abcf609503246996c6578d07e1e3
+        build_date: 2024-01-09
   - name: Ubuntu 22.04 Minimal
     enable: true
     shortname: ubuntu-22.04-minimal
@@ -268,11 +268,11 @@ images:
       provided_until: none
     tags: []
     latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/jammy/release/SHA256SUMS
-    latest_url: 
+    latest_url:
       https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
     versions:
       - version: '20231207'
-        url: 
+        url:
           https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-22.04-minimal/20231207-ubuntu-22.04-minimal.qcow2
         checksum: sha256:a1af5cec732afebf21df98f7fa27c13ebc481d5afb2e732641e67a7d2a266642
         build_date: 2023-12-07

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/openstack_image_manager/manage.py

@@ -335,9 +335,9 @@ class ImageManager:
                         versions[version["version"]]["meta"]["image_source"] = url
 
                     if "build_date" in version:
-                        versions[version["version"]]["meta"][
-                            "image_build_date"
-                        ] = date.isoformat(version["build_date"])
+                        versions[version["version"]]["meta"]["image_build_date"] = (
+                            date.isoformat(version["build_date"])
+                        )
 
                     if "id" in version:
                         versions[version["version"]]["id"] = version["id"]
@@ -1097,7 +1097,11 @@ class ImageManager:
                             logger.info("Deactivating image '%s'" % image)
                             self.conn.image.deactivate_image(cloud_image.id)
 
-                        if self.CONF.hide and not self.CONF.dry_run:
+                        if (
+                            self.CONF.hide
+                            and not self.CONF.dry_run
+                            and cloud_image.visibility != "community"
+                        ):
                             logger.info(
                                 "Setting visibility of '%s' to 'community'" % image
                             )
@@ -1107,6 +1111,17 @@ class ImageManager:
                     except Exception as e:
                         logger.error("An Exception occurred: \n%s" % e)
                         self.exit_with_error = True
+            elif counter[image_name] <= last:
+                logger.info(
+                    f"Image '{image}' will not be deleted, {counter[image_name]} <= {last}"
+                )
+                if (
+                    self.CONF.hide
+                    and not self.CONF.dry_run
+                    and cloud_image.visibility != "community"
+                ):
+                    logger.info("Setting visibility of '%s' to 'community'" % image)
+                    self.conn.image.update_image(cloud_image.id, visibility="community")
             elif (
                 counter[image_name] < last and self.CONF.hide and not self.CONF.dry_run
             ):

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/openstack_image_manager/mirror.py

@@ -37,7 +37,6 @@ def main(
     ),
     minio_bucket: str = typer.Option("openstack-images", help="Minio bucket"),
 ):
-
     if debug:
         level = "DEBUG"
     else:
@@ -51,6 +50,18 @@ def main(
     logger.remove()
     logger.add(sys.stderr, format=log_fmt, level=level, colorize=True)
 
+    client = Minio(
+        minio_server,
+        access_key=minio_access_key,
+        secret_key=minio_secret_key,
+    )
+
+    result = client.bucket_exists(minio_bucket)
+    if not result:
+        logger.error(f"Create bucket '{minio_bucket}' first")
+        if not dry_run:
+            sys.exit(1)
+
     onlyfiles = []
     for f in listdir(images):
         if isfile(join(images, f)):
@@ -58,24 +69,17 @@ def main(
             onlyfiles.append(f)
 
     all_images = []
-    for file in onlyfiles:
+    for file in [x for x in onlyfiles if x.endswith(".yml")]:
+        logger.info(f"Processing file {file}")
         with open(join(images, file)) as fp:
             data = yaml.load(fp, Loader=yaml.SafeLoader)
             for image in data.get("images"):
                 logger.debug(f"Adding {image['name']} to the list of images")
                 all_images.append(image)
 
-    client = Minio(
-        minio_server,
-        access_key=minio_access_key,
-        secret_key=minio_secret_key,
-    )
-
-    result = client.bucket_exists(minio_bucket)
-    if not result:
-        logger.error(f"Create bucket '{minio_bucket}' first")
-
     for image in all_images:
+        logger.info(f"Processing image {image['name']}")
+
         if "versions" not in image:
             continue
 
@@ -105,31 +109,32 @@ def main(
 
             try:
                 client.stat_object(minio_bucket, os.path.join(dirname, filename))
-                logger.info(f"'{filename}' available in '{dirname}'")
+                logger.info(f"File {filename} available in bucket {dirname}")
             except S3Error:
-                logger.info(f"'{filename}' not yet available in '{dirname}'")
+                logger.info(f"File {filename} not yet available in bucket {dirname}")
 
-                logger.info(f"Downloading {version['source']}")
-                response = requests.get(
-                    version["source"], stream=True, allow_redirects=True
-                )
-                with open(os.path.basename(path.path), "wb") as fp:
-                    shutil.copyfileobj(response.raw, fp)
-                del response
+                if not isfile(os.path.basename(path.path)):
+                    logger.info(f"Downloading {version['source']}")
+                    response = requests.get(
+                        version["source"], stream=True, allow_redirects=True
+                    )
+                    with open(os.path.basename(path.path), "wb") as fp:
+                        shutil.copyfileobj(response.raw, fp)
+                    del response
 
                 if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-                    logger.info(f"Decompressing '{os.path.basename(path.path)}'")
+                    logger.info(f"Decompressing {os.path.basename(path.path)}")
                     patoolib.extract_archive(os.path.basename(path.path), outdir=".")
                     os.remove(os.path.basename(path.path))
 
                 if not dry_run:
-                    logger.info(f"Uploading '{filename}' to '{dirname}'")
+                    logger.info(f"Uploading {filename} to bucket {dirname}")
                     client.fput_object(
                         minio_bucket, os.path.join(dirname, filename), filename
                     )
                 else:
                     logger.info(
-                        f"Not uploading '{filename}' to '{dirname}' (dry-run enabled)"
+                        f"Not uploading {filename} to bucket {dirname} (dry-run enabled)"
                     )
 
                 os.remove(filename)

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/openstack_image_manager/update.py

@@ -281,7 +281,6 @@ def main(
         envvar="SWIFT_PREFIX",
     ),
 ):
-
     if debug:
         level = "DEBUG"
     else:

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0/openstack_image_manager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstack-image-manager
-Version: 0.20231212.0
+Version: 0.20240211.0
 Summary: OpenStack image manager
 Author-email: OSISM community <info@osism.tech>
 License:                                  Apache License
@@ -223,14 +223,14 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: loguru==0.7.2
-Requires-Dist: minio==7.2.0
+Requires-Dist: minio==7.2.3
 Requires-Dist: munch==4.0.0
 Requires-Dist: natsort==8.4.0
-Requires-Dist: openstacksdk==2.0.0
-Requires-Dist: paramiko==3.3.1
+Requires-Dist: openstacksdk==2.1.0
+Requires-Dist: paramiko==3.4.0
 Requires-Dist: patool==1.15.0
 Requires-Dist: requests==2.31.0
-Requires-Dist: ruamel.yaml==0.18.5
+Requires-Dist: ruamel.yaml==0.18.6
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: typer[all]==0.9.0
 Requires-Dist: yamale==4.0.4

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/openstack_image_manager.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ etc/images/gardenlinux.yml
 etc/images/kubernetes.yml
 etc/images/opensuse.yml
 etc/images/opnsense.yml
+etc/images/osism.yml
 etc/images/rockylinux.yml
 etc/images/talos.yml
 etc/images/ubuntu.yml

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/openstack_image_manager.egg-info/requires.txt

@@ -1,12 +1,12 @@
 loguru==0.7.2
-minio==7.2.0
+minio==7.2.3
 munch==4.0.0
 natsort==8.4.0
-openstacksdk==2.0.0
-paramiko==3.3.1
+openstacksdk==2.1.0
+paramiko==3.4.0
 patool==1.15.0
 requests==2.31.0
-ruamel.yaml==0.18.5
+ruamel.yaml==0.18.6
 tabulate==0.9.0
 typer[all]==0.9.0
 yamale==4.0.4

{openstack-image-manager-0.20231212.0 → openstack-image-manager-0.20240211.0}/requirements.txt

@@ -1,12 +1,12 @@
 loguru==0.7.2
-minio==7.2.0
+minio==7.2.3
 munch==4.0.0
 natsort==8.4.0
-openstacksdk==2.0.0
-paramiko==3.3.1
+openstacksdk==2.1.0
+paramiko==3.4.0
 patool==1.15.0
 requests==2.31.0
-ruamel.yaml==0.18.5
+ruamel.yaml==0.18.6
 tabulate==0.9.0
 typer[all]==0.9.0
 yamale==4.0.4

openstack-image-manager-0.20231212.0/etc/images/gardenlinux.yml

@@ -1,39 +0,0 @@
----
-images:
-  - name: Garden Linux
-    enable: true
-    format: qcow2
-    login: admin
-    min_disk: 10
-    min_ram: 512
-    status: active
-    visibility: public
-    multi: false
-    meta:
-      architecture: x86_64
-      hw_disk_bus: virtio
-      hw_rng_model: virtio
-      hw_scsi_model: virtio-scsi
-      hw_watchdog_action: reset
-      os_distro: debian
-      replace_frequency: never
-      uuid_validity: none
-      provided_until: none
-    tags: []
-    versions:
-      - version: '934.8'
-        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.8.qcow2
-        checksum: "sha256:68a4cb768224aec313a8c974cec412fe8b2754f0189a318ce9dbdba13fd89597"
-        build_date: 2023-05-12
-      - version: '934.9'
-        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.9.qcow2
-        checksum: "sha256:314aa8369a46a7c9fd97343a688c75b9c282f654fb05e9bb4d6b94646bf3670c"
-        build_date: 2023-06-03
-      - version: '934.10'
-        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.10.qcow2
-        checksum: "sha256:995e40bb7dcf044f82650f8131bc8b440215e5f1023c4edca81da585e7068b4f"
-        build_date: 2023-08-28
-      - version: '934.11'
-        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.11.qcow2
-        checksum: "sha256:616a217afe692ba8b6a9eca3a99291414b77a819c18430e6cba1b01a7ba6238b"
-        build_date: 2023-10-25