Ensure magnum is using correct regions

Enable magnum testing again.

Change-Id: Ie3f03c271058eb5229512e08435dc0b7e6b8fa2e
Signed-off-by: Guillaume Boutry <guillaume.boutry@canonical.com>

charms/magnum-k8s/src/templates/magnum.conf.j2

@@ -8,6 +8,7 @@ transport_url = {{ amqp.transport_url }}
 {% include "parts/section-database" %}
 
 {% include "parts/section-identity" %}
+region_name = {{ options.region }}
 
 [keystone_auth]
 auth_section = keystone_authtoken
@@ -23,7 +24,7 @@ driver = messaging
 
 [cinder_client]
 endpoint_type = adminURL
-region_name = RegionOne
+region_name = {{ options.region }}
 
 [api]
 api_paste_config=/etc/magnum/api-paste.ini
@@ -35,26 +36,31 @@ workers = 4
 {% include "parts/section-oslo-messaging-rabbit" %}
 
 [glance_client]
+region_name = {{ options.region }}
 {% if receive_ca_cert and receive_ca_cert.ca_bundle -%}
 ca_file = /usr/local/share/ca-certificates/ca-bundle.pem
 {% endif -%}
 
 [heat_client]
+region_name = {{ options.region }}
 {% if receive_ca_cert and receive_ca_cert.ca_bundle -%}
 ca_file = /usr/local/share/ca-certificates/ca-bundle.pem
 {% endif -%}
 
 [neutron_client]
+region_name = {{ options.region }}
 {% if receive_ca_cert and receive_ca_cert.ca_bundle -%}
 ca_file = /usr/local/share/ca-certificates/ca-bundle.pem
 {% endif -%}
 
 [nova_client]
+region_name = {{ options.region }}
 {% if receive_ca_cert and receive_ca_cert.ca_bundle -%}
 ca_file = /usr/local/share/ca-certificates/ca-bundle.pem
 {% endif -%}
 
 [octavia_client]
+region_name = {{ options.region }}
 {% if receive_ca_cert and receive_ca_cert.ca_bundle -%}
 ca_file = /usr/local/share/ca-certificates/ca-bundle.pem
 {% endif -%}

tests/all-k8s/smoke.yaml.j2

@@ -241,19 +241,19 @@ applications:
       octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2024.1
       octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2024.1
   # CAAS feature
-  # magnum:
-  #   {% if magnum_k8s is defined and magnum_k8s is sameas true -%}
-  #   charm: ../../../magnum-k8s.charm
-  #   {% else -%}
-  #   charm: ch:magnum-k8s
-  #   channel: 2024.1/edge
-  #   {% endif -%}
-  #   base: ubuntu@24.04
-  #   scale: 1
-  #   trust: false
-  #   resources:
-  #     magnum-api-image: ghcr.io/canonical/magnum-consolidated:2024.1
-  #     magnum-conductor-image: ghcr.io/canonical/magnum-consolidated:2024.1
+  magnum:
+    {% if magnum_k8s is defined and magnum_k8s is sameas true -%}
+    charm: ../../../magnum-k8s.charm
+    {% else -%}
+    charm: ch:magnum-k8s
+    channel: 2024.1/edge
+    {% endif -%}
+    base: ubuntu@24.04
+    scale: 1
+    trust: false
+    resources:
+      magnum-api-image: ghcr.io/canonical/magnum-consolidated:2024.1
+      magnum-conductor-image: ghcr.io/canonical/magnum-consolidated:2024.1
   # Telemetry feature
   gnocchi:
     {% if gnocchi_k8s is defined and gnocchi_k8s is sameas true -%}
@@ -493,18 +493,18 @@ relations:
 - - keystone:send-ca-cert
   - barbican:receive-ca-cert
 
-# - - mysql:database
-#   - magnum:database
-# - - rabbitmq:amqp
-#   - magnum:amqp
-# - - keystone:identity-service
-#   - magnum:identity-service
-# - - keystone:identity-ops
-#   - magnum:identity-ops
-# - - traefik:ingress
-#   - magnum:ingress-internal
-# - - keystone:send-ca-cert
-#   - magnum:receive-ca-cert
+- - mysql:database
+  - magnum:database
+- - rabbitmq:amqp
+  - magnum:amqp
+- - keystone:identity-service
+  - magnum:identity-service
+- - keystone:identity-ops
+  - magnum:identity-ops
+- - traefik:ingress
+  - magnum:ingress-internal
+- - keystone:send-ca-cert
+  - magnum:receive-ca-cert
 
 - - mysql:database
   - cinder:database

tests/all-k8s/tests.yaml

@@ -88,8 +88,8 @@ target_deploy_status:
     workload-status: active
     workload-status-message-regex: '^$'
   magnum:
-    workload-status: waiting
-    workload-status-message-regex: '^.*$'
+    workload-status: active
+    workload-status-message-regex: '^$'
   cinder:
     workload-status: active
     workload-status-message-regex: '^$'