openstack-image-manager 0.20240812.0__py3-none-any.whl → 0.20240829.0__py3-none-any.whl

openstack_image_manager/etc/images/rockylinux.yml

@@ -0,0 +1,72 @@
+---
+images:
+  - name: Rocky 8
+    enable: false
+    shortname: rocky-8
+    format: qcow2
+    login: rocky
+    min_disk: 10
+    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
+      hypervisor_type: qemu
+      os_distro: centos
+      os_version: '8'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: 
+      https://download.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2.CHECKSUM
+    latest_url: 
+      https://download.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
+    versions:
+      - version: '20240529'
+        url: 
+          https://download.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/rocky-8/20240529-rocky-8.qcow2
+        checksum: sha256:e56066c58606191e96184de9a9183a3af33c59bcbd8740d8b10ca054a7a89c14
+        build_date: 2024-05-29
+  - name: Rocky 9
+    enable: true
+    shortname: rocky-9
+    format: qcow2
+    login: rocky
+    min_disk: 10
+    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
+      hypervisor_type: qemu
+      os_distro: centos
+      os_version: '9'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: 
+      https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2.CHECKSUM
+    latest_url: 
+      https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+    versions:
+      - version: '20240612'
+        url: 
+          https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/rocky-9/20240612-rocky-9.qcow2
+        checksum: sha256:7a4ae4fbbdafaff3f0ba6166ef5b64da23e55ac71eff7489b937db11c9ba5dd7
+        build_date: 2024-06-12

openstack_image_manager/etc/images/talos.yml

@@ -0,0 +1,41 @@
+---
+images:
+
+  - name: Talos Linux
+    enable: false
+    shortname: talos
+    format: raw
+    login: none
+    min_disk: 2
+    min_ram: 1024
+    status: active
+    visibility: public
+    multi: false
+    meta:
+      architecture: x86_64
+      hw_disk_bus: scsi
+      hw_rng_model: virtio
+      hw_scsi_model: virtio-scsi
+      hw_watchdog_action: reset
+      hypervisor_type: qemu
+      os_distro: talos
+      replace_frequency: never
+      uuid_validity: none
+      provided_until: none
+    tags: []
+    versions:
+      - version: '1.3.6'
+        url: https://github.com/siderolabs/talos/releases/download/v1.3.6/openstack-amd64.tar.gz
+        mirror_url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/talos/1.3.6/disk.raw
+        checksum: "sha256:1db0cfd9bd9c3d3165911ab89ef05dad1d590cc442fb0702564cfe737b3f3dbd"
+        build_date: 2023-03-14
+      - version: '1.4.5'
+        url: https://github.com/siderolabs/talos/releases/download/v1.4.5/openstack-amd64.tar.gz
+        mirror_url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/talos/1.4.5/disk.raw
+        checksum: "sha256:fc7dc71a6acece93196c8bace15139469b7bfbe4fa7d001336da0fdda9b437c9"
+        build_date: 2023-05-30
+      - version: '1.6.0'
+        url: https://github.com/siderolabs/talos/releases/download/v1.6.0/openstack-amd64.raw.xz
+        mirror_url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/talos/1.6.0/openstack-amd64.raw
+        checksum: "sha256:e3754c2338b4ce831db5442cf62deab260d56b64227a07cfc26e4b73eef5abaf"
+        build_date: 2023-12-15

openstack_image_manager/etc/images/ubuntu.yml

@@ -0,0 +1,334 @@
+---
+images:
+  - name: Ubuntu 14.04
+    enable: false
+    shortname: ubuntu-14.04
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '14.04'
+      replace_frequency: never
+      uuid_validity: none
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/trusty/current/SHA256SUMS
+    latest_url: 
+      https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+    versions:
+      - version: '20191107'
+        url: 
+          https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+        mirror_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
+  - name: Ubuntu 16.04
+    enable: false
+    shortname: ubuntu-16.04
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '16.04'
+      replace_frequency: never
+      uuid_validity: none
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/xenial/current/SHA256SUMS
+    latest_url: 
+      https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+    versions:
+      - version: '20211001'
+        url: 
+          https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+        mirror_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
+  - name: Ubuntu 16.04 Minimal
+    enable: false
+    shortname: ubuntu-16.04-minimal
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '16.04'
+      replace_frequency: never
+      uuid_validity: none
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/xenial/release/SHA256SUMS
+    latest_url: 
+      https://cloud-images.ubuntu.com/minimal/releases/xenial/release/ubuntu-16.04-minimal-cloudimg-amd64-disk1.img
+    versions:
+      - version: '20210929'
+        url: 
+          https://cloud-images.ubuntu.com/minimal/releases/xenial/release/ubuntu-16.04-minimal-cloudimg-amd64-disk1.img
+        mirror_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
+  - name: Ubuntu 18.04
+    enable: false
+    shortname: ubuntu-18.04
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '18.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/bionic/current/SHA256SUMS
+    latest_url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
+    versions:
+      - version: '20230607'
+        url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
+        mirror_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
+  - name: Ubuntu 18.04 Minimal
+    enable: false
+    shortname: ubuntu-18.04-minimal
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '18.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/bionic/release/SHA256SUMS
+    latest_url: 
+      https://cloud-images.ubuntu.com/minimal/releases/bionic/release/ubuntu-18.04-minimal-cloudimg-amd64.img
+    versions:
+      - version: '20230602'
+        url: 
+          https://cloud-images.ubuntu.com/minimal/releases/bionic/release/ubuntu-18.04-minimal-cloudimg-amd64.img
+        mirror_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
+  - name: Ubuntu 20.04
+    enable: false
+    shortname: ubuntu-20.04
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '20.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/focal/current/SHA256SUMS
+    latest_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
+    versions:
+      - version: '20240704'
+        url: https://cloud-images.ubuntu.com/focal/20240704/focal-server-cloudimg-amd64.img
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-20.04/20240704-ubuntu-20.04.qcow2
+        checksum: sha256:70f0345ca9a1b3b0bbc4719a9c5992c456cf766d0d84ce3d7716ecc21a421778
+        build_date: 2024-07-04
+  - name: Ubuntu 20.04 Minimal
+    enable: false
+    shortname: ubuntu-20.04-minimal
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '20.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/focal/release/SHA256SUMS
+    latest_url: 
+      https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
+    versions:
+      - version: '20240626'
+        url: 
+          https://cloud-images.ubuntu.com/minimal/releases/focal/release-20240626/ubuntu-20.04-minimal-cloudimg-amd64.img
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-20.04-minimal/20240626-ubuntu-20.04-minimal.qcow2
+        checksum: sha256:daa835c3786acea38047fd1c2f23ff3b4e8b7b337753e1ddb3ba1ad56282b325
+        build_date: 2024-06-26
+  - name: Ubuntu 22.04
+    enable: true
+    shortname: ubuntu-22.04
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '22.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    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: '20240705'
+        url: https://cloud-images.ubuntu.com/jammy/20240705/jammy-server-cloudimg-amd64.img
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-22.04/20240705-ubuntu-22.04.qcow2
+        checksum: sha256:eab12734a1743c79f8816419a72319903fcfa92baab561e47029aafc33a79869
+        build_date: 2024-07-05
+  - name: Ubuntu 22.04 Minimal
+    enable: true
+    shortname: ubuntu-22.04-minimal
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '22.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/minimal/releases/jammy/release/SHA256SUMS
+    latest_url: 
+      https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
+    versions:
+      - version: '20240701'
+        url: 
+          https://cloud-images.ubuntu.com/minimal/releases/jammy/release-20240701/ubuntu-22.04-minimal-cloudimg-amd64.img
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-22.04-minimal/20240701-ubuntu-22.04-minimal.qcow2
+        checksum: sha256:3ff079f2792611454e2034ad8bd23a145b2ab6f314769a85457d1f6f5c1bc9c9
+        build_date: 2024-07-01
+  - name: Ubuntu 24.04
+    enable: true
+    shortname: ubuntu-24.04
+    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
+      hypervisor_type: qemu
+      os_distro: ubuntu
+      os_version: '24.04'
+      replace_frequency: quarterly
+      uuid_validity: last-3
+      provided_until: none
+    tags: []
+    latest_checksum_url: https://cloud-images.ubuntu.com/noble/current/SHA256SUMS
+    latest_url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+    versions:
+      - version: '20240702'
+        url: https://cloud-images.ubuntu.com/noble/20240702/noble-server-cloudimg-amd64.img
+        mirror_url: 
+          https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-images/ubuntu-24.04/20240702-ubuntu-24.04.qcow2
+        checksum: sha256:182dc760bfca26c45fb4e4668049ecd4d0ecdd6171b3bae81d0135e8f1e9d93e
+        build_date: 2024-07-02

openstack_image_manager/etc/schema.yaml

@@ -0,0 +1,56 @@
+---
+images: list(include('image'), min=1)
+
+---
+image:
+  enable: bool()
+  format: enum('aki', 'ari', 'ami', 'raw', 'iso', 'vhd', 'vdi', 'qcow2', 'vmdk')
+  latest_checksum_url: regex('^(http|ftp)s?:\/\/\w+.*', name='valid URL', required=False)
+  latest_url: regex('^(http|ftp)s?:\/\/\w+.*', name='valid URL', required=False)
+  login: str()
+  meta: include('meta', required=True)
+  min_disk: int(min=0)
+  min_ram: int(min=0)
+  multi: bool()
+  keep: bool(required=False)
+  name: str()
+  password: str(required=False)
+  shortname: str(required=False)
+  status: enum('active', 'deactivated')
+  separator: str(required=False)
+  tags: list(str())
+  versions: list(include('versions'))
+  visibility: enum('public', 'private', 'community', 'shared')
+
+---
+meta:
+  architecture: enum('x86_64', 'aarch64', 'risc-v')
+  hypervisor_type: enum('hyperv', 'ironic', 'lxc', 'qemu', 'uml', 'vmware', 'xen')
+  hotfix_hours: int(min=0, required=False)
+  hw_disk_bus: enum('virtio', 'scsi', None)
+  hw_rng_model: enum('virtio', None, required=False)
+  hw_scsi_model: enum('virtio-scsi', required=False)
+  hw_watchdog_action: enum('disabled', 'reset', 'poweroff', 'pause', 'none', required=False)
+  image_description: str(required=False)
+  os_distro: enum('arch', 'centos', 'cirros', 'clearlinux', 'debian', 'fedora', 'freebsd', 'opensuse', 'rhel', 'talos', 'ubuntu', 'windows')
+  os_version: str(required=False)
+  patchlevel: str(required=False)
+  provided_until: any(enum('none'), day())
+  replace_frequency: enum('yearly', 'quarterly', 'monthly', 'weekly', 'daily', 'critical_bug', 'never')
+  uuid_validity: any(enum('none', 'forever', 'notice'), str(starts_with='last-'), day())
+
+---
+versions:
+  build_date: any(day(), timestamp())
+  checksum: regex('\w+:([a-f0-9]{32}|[a-f0-9]{40}|[a-f0-9]{64}|[a-f0-9]{128})$', name='valid checksum', required=False)
+  checksums_url: regex('^(http|ftp)s?:\/\/\w+.*', name='valid URL', required=False)
+  hidden: bool(required=False)
+  image_description: str(required=False)
+  meta: include('meta', required=False)
+  os_version: str(required=False)
+  source: regex('^(http|ftp)s?:\/\/\w+.*|^private$', name='valid URL or private', required=False)
+  url: regex('^(http|ftp)s?:\/\/\w+.*|^(file:|file:///)\w+.*', name='valid URL')
+  mirror_url: regex('^(http|ftp)s?:\/\/\w+.*|^(file:|file:///)\w+.*', name='valid URL', required=False)
+  version: str()
+  visibility: enum('public', 'private', 'community', 'shared', required=False)
+  id: regex('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$', required=False)

openstack_image_manager/main.py

@@ -12,6 +12,7 @@ import typing
 from typing import Dict, Set
 import yamale
 import urllib.parse
+import pkgutil
 
 from datetime import datetime, date
 from decimal import Decimal, ROUND_UP
@@ -92,9 +93,14 @@ class ImageManager:
             "project", "--share-type", help="Share - Type: 'project' or 'domain'"
         ),
         check: bool = typer.Option(
+            True,
+            "--check/--no-check",
+            help="Check the local image definitions against the SCS Image Metadata Standard (and process the images)",
+        ),
+        check_only: bool = typer.Option(
             False,
-            "--check",
-            help="Check the local image definitions against the SCS Image Metadata Standard",
+            "--check-only",
+            help="Quit after checking the image definitions against the SCS Image Metadata Standard",
         ),
     ):
         self.CONF = Munch.fromDict(locals())
@@ -209,11 +215,14 @@ class ImageManager:
         )
 
         # check local image definitions with yamale
-        if self.CONF.check:
+        if self.CONF.check or self.CONF.check_only:
             self.validate_yaml_schema()
 
+        if self.CONF.check_only:
+            return
+
         # share image (previously share.py)
-        elif self.CONF.share_image:
+        if self.CONF.share_image:
             self.create_connection()
             image = self.conn.get_image(self.CONF.share_image)
 
@@ -355,6 +364,9 @@ class ImageManager:
             if "image_description" not in image["meta"]:
                 image["meta"]["image_description"] = image["name"]
 
+            if "image_name" not in image["meta"]:
+                image["meta"]["image_name"] = image["name"]
+
             existing_images, imported_image, previous_image = self.process_image(
                 image, versions, sorted_versions, image["meta"].copy()
             )
@@ -362,7 +374,7 @@ class ImageManager:
 
             if imported_image and image["multi"]:
                 self.rename_images(
-                    image["name"], sorted_versions, imported_image, previous_image
+                    image, sorted_versions, imported_image, previous_image
                 )
 
         return managed_images
@@ -511,11 +523,14 @@ class ImageManager:
         previous_image = None
         upstream_checksum = ""
 
+        separator = image.get("separator", " ")
+        image_name = image["name"]
+
         for version in sorted_versions:
             if image["multi"]:
-                name = f"{image['name']} ({version})"
+                name = f"{image_name}{separator}({version})"
             else:
-                name = f"{image['name']} {version}"
+                name = f"{image_name}{separator}{version}"
 
             logger.info(f"Processing image '{name}'")
             logger.debug(f"Checking existence of '{name}'")
@@ -550,7 +565,7 @@ class ImageManager:
                 and version == sorted_versions[-1]
                 and not existence
             ):
-                previous = f"{image['name']} ({sorted_versions[-2]})"
+                previous = f"{image['name']}{separator}({sorted_versions[-2]})"
                 existence = previous in cloud_images and image["name"] in cloud_images
 
             elif (
@@ -825,7 +840,7 @@ class ImageManager:
 
     def rename_images(
         self,
-        name: str,
+        image: dict,
         sorted_versions: list,
         imported_image: Image,
         previous_image: Image,
@@ -834,16 +849,18 @@ class ImageManager:
         Rename outdated images in Glance (only applies to images of type multi)
 
         Params:
-            name: the name of the image from images.yml
+            image: image dict from images.yml
             sorted_versions: list with all sorted image versions
             imported_image: the newly imported image
             previous_image: the previous latest image
         """
+        name = image["name"]
+        separator = image.get("separator", " ")
         cloud_images = self.get_images()
 
         if len(sorted_versions) > 1:
-            latest = f"{name} ({sorted_versions[-1]})"
-            previous_latest = f"{name} ({sorted_versions[-2]})"
+            latest = f"{name}{separator}({sorted_versions[-1]})"
+            previous_latest = f"{name}{separator}({sorted_versions[-2]})"
 
             if name in cloud_images and previous_latest not in cloud_images:
                 logger.info(f"Renaming {name} to {previous_latest}")
@@ -865,7 +882,7 @@ class ImageManager:
                 )
                 create_date = create_date.replace("-", "")
 
-                previous_latest = f"{name} ({create_date})"
+                previous_latest = f"{name}{separator}({create_date})"
 
                 logger.info(
                     f"Setting internal_version: {create_date} for {previous_latest}"
@@ -874,9 +891,7 @@ class ImageManager:
                     previous_image.id, **{"internal_version": create_date}
                 )
             else:
-                previous_latest = (
-                    f"{name} ({previous_image['properties']['internal_version']})"
-                )
+                previous_latest = f"{name}{separator}({previous_image['properties']['internal_version']})"
 
             logger.info(f"Renaming old latest '{name}' to '{previous_latest}'")
             self.conn.image.update_image(previous_image.id, name=previous_latest)
@@ -885,7 +900,7 @@ class ImageManager:
             self.conn.image.update_image(imported_image.id, name=name)
 
         elif len(sorted_versions) == 1:
-            latest = f"{name} ({sorted_versions[-1]})"
+            latest = f"{name}{separator}({sorted_versions[-1]})"
 
             if latest in cloud_images:
                 logger.info(f"Renaming {latest} to {name}")
@@ -1100,25 +1115,37 @@ class ImageManager:
 
     def validate_yaml_schema(self):
         """Validate all image.yaml files against the SCS Metadata spec"""
-        schema = yamale.make_schema("etc/schema.yaml")
         try:
+            # We are a pip package
+            schema_data = pkgutil.get_data(__name__, "etc/schema.yaml").decode("utf-8")
+            schema = yamale.make_schema(content=schema_data)
+        except Exception:
+            # We are a cloned repo
+            schema = yamale.make_schema("etc/schema.yaml")
+        try:
+            validation_error_log = []
             for file in os.listdir(self.CONF.images):
                 try:
                     data = yamale.make_data(self.CONF.images + file)
                     yamale.validate(schema, data)
                 except YamaleError as e:
-                    self.exit_with_error = True
                     for result in e.results:
                         logger.error(
                             f"Error validating data '{result.data}' with '{result.schema}'"
                         )
                         for error in result.errors:
                             logger.error(f"\t{error}")
+                            validation_error_log.append((file, error))
                 else:
                     logger.debug(f"Image file {file} is valid")
         except FileNotFoundError:
             logger.error(f"Invalid path '{self.CONF.images}'")
 
+        if len(validation_error_log) > 0:
+            sys.exit(
+                f"Image definition validation failed with these error(s): {validation_error_log}"
+            )
+
     def share_image_with_project(self, image, project):
         member = self.conn.image.find_member(project.id, image.id)