Merge "Do not crate amphora image when octavia not enabled"

Mirantis · Dec 4, 2024 · 1f9a44f · 1f9a44f
2 parents ffceb19 + c3b2385
commit 1f9a44f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/charts/openstack/glance/templates/bin/_bootstrap.py.tpl b/charts/openstack/glance/templates/bin/_bootstrap.py.tpl
@@ -136,7 +136,7 @@ ost = openstack.connect()
 for image_name, image in STRUCTURED_IMAGES.items():
     image_name = image.pop("name", image_name)
     if not image.get("enabled", True):
-        LOG.info("Skipping handling image {image_name} as its not enabled.")
+        LOG.info(f"Skipping handling image {image_name} as its not enabled.")
         continue
     LOG.info(f"Handling image: {image_name}")
 

diff --git a/rockoon/templates/services/image.yaml b/rockoon/templates/services/image.yaml
@@ -167,6 +167,7 @@ spec:
                 enabled: true
                 hash_method: SHA-256
 {%- endif %}
+{%- if "load-balancer" in spec.features.services %}
             amphora-x64-haproxy:
               container_format: bare
               image_type: qcow2
@@ -182,6 +183,7 @@ spec:
                 enabled: true
                 hash_method: SHA-256
 {%- endif %}
+{%- endif %}
 {%- if "shared-file-system" in spec.features.services %}
             manila-service-image:
               container_format: bare