From 8b44055848e4c72e7cb7d0bdfc4d10c40a662601 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Fri, 27 Mar 2020 14:57:18 -0700
Subject: [PATCH] Update peers with API addresses

Use default_update_peers which will publish admin, internal and public
addresses to peers.

Change-Id: Ic9b25431c1f5574bad855731d0210a9dbedacfc7
Closes-Bug: #1858132
(cherry picked from commit c1c2278530f2b852bbbb1f1df156225d0df5f3a2)
---
 src/reactive/manila_handlers.py | 1 +
 src/tests/basic_deployment.py   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/reactive/manila_handlers.py b/src/reactive/manila_handlers.py
index 4a51ba8..7ce7edc 100644
--- a/src/reactive/manila_handlers.py
+++ b/src/reactive/manila_handlers.py
@@ -34,6 +34,7 @@ charms_openstack.charm.use_defaults(
     'shared-db.connected',
     'upgrade-charm',
     'certificates.available',
+    'cluster.available',
 )
 
 
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index f4511a4..41710ca 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -59,7 +59,8 @@ class ManilaBasicDeployment(OpenStackAmuletDeployment):
              'constraints': {'mem': '3072M'}},
             {'name': 'rabbitmq-server'},
             {'name': 'keystone'},
-            {'name': 'manila-generic'}
+            {'name': 'manila-generic',
+                'location': 'cs:~openstack-charmers/manila-generic'}
         ]
         super(ManilaBasicDeployment, self)._add_services(
             this_service, other_services)