From 96254cd5e6361e1437d7d02d9ff416a678276d55 Mon Sep 17 00:00:00 2001
From: Hemanth Nakkina <hemanth.nakkina@canonical.com>
Date: Wed, 2 Nov 2022 13:51:44 +0530
Subject: [PATCH] Use ingress-public in wsgi configuration

To expose ingress paths, use ingress-public
instead of ingress-internal in wsgi
configuration file

Add placement services to test bundle

Change-Id: Ib233d37952224590bb8b2b8418ab73f13b4aa804
---
 .../nova-k8s/src/templates/wsgi-nova-api.conf.j2  |  4 ++--
 charms/nova-k8s/tests/bundles/xena.yaml           | 15 +++++++++++++++
 charms/nova-k8s/tests/tests.yaml                  |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/charms/nova-k8s/src/templates/wsgi-nova-api.conf.j2 b/charms/nova-k8s/src/templates/wsgi-nova-api.conf.j2
index 6ad81465..3d90ef2c 100644
--- a/charms/nova-k8s/src/templates/wsgi-nova-api.conf.j2
+++ b/charms/nova-k8s/src/templates/wsgi-nova-api.conf.j2
@@ -4,8 +4,8 @@ Listen {{ wsgi_nova_metadata.public_port }}
     WSGIDaemonProcess nova-api processes=4 threads=1 user={{ wsgi_config.user }} group={{ wsgi_config.group }} \
                       display-name=%{GROUP}
     WSGIProcessGroup nova-api
-    {% if ingress_internal and ingress_internal.ingress_path -%}
-    WSGIScriptAlias {{ ingress_internal.ingress_path }} {{ wsgi_config.wsgi_public_script }}
+    {% if ingress_public and ingress_public.ingress_path -%}
+    WSGIScriptAlias {{ ingress_public.ingress_path }} {{ wsgi_config.wsgi_public_script }}
     {% endif -%}
     WSGIScriptAlias / {{ wsgi_config.wsgi_public_script }}
     WSGIApplicationGroup %{GLOBAL}
diff --git a/charms/nova-k8s/tests/bundles/xena.yaml b/charms/nova-k8s/tests/bundles/xena.yaml
index aaa3cd79..13901e6f 100644
--- a/charms/nova-k8s/tests/bundles/xena.yaml
+++ b/charms/nova-k8s/tests/bundles/xena.yaml
@@ -49,6 +49,12 @@ applications:
       nova-scheduler-image: kolla/ubuntu-binary-nova-scheduler:xena
       nova-conductor-image: kolla/ubuntu-binary-nova-conductor:xena
 
+  placement:
+    charm: ch:placement-k8s
+    channel: edge
+    scale: 1
+    trust: true
+
 relations:
 - - traefik:ingress
   - keystone:ingress-internal
@@ -72,3 +78,12 @@ relations:
   - nova:ingress-internal
 - - traefik-public:ingress
   - nova:ingress-public
+
+- - mysql:database
+  - placement:database
+- - keystone:identity-service
+  - placement:identity-service
+- - traefik:ingress
+  - placement:ingress-internal
+- - traefik-public:ingress
+  - placement:ingress-public
diff --git a/charms/nova-k8s/tests/tests.yaml b/charms/nova-k8s/tests/tests.yaml
index 1b8daf0c..eaae2bc6 100644
--- a/charms/nova-k8s/tests/tests.yaml
+++ b/charms/nova-k8s/tests/tests.yaml
@@ -49,3 +49,6 @@ target_deploy_status:
   mysql:
     workload-status: active
     workload-status-message-regex: '^$'
+  placement:
+    workload-status: active
+    workload-status-message-regex: '^$'