nagios-charmers team mailing list archive

[Adam Dyess <adam.dyess@xxxxxxxxxxxxx>]

Adam Dyess has proposed merging ~addyess/charm-nagios:test/swap_mysql_to_percona into charm-nagios:master.

Requested reviews:
  Nagios Charm developers (nagios-charmers)

For more details, see:
https://code.launchpad.net/~addyess/charm-nagios/+git/charm-nagios/+merge/387545
-- 
Your team Nagios Charm developers is requested to review the proposed merge of ~addyess/charm-nagios:test/swap_mysql_to_percona into charm-nagios:master.

diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index fafe7f0..d607a62 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -200,8 +200,8 @@ async def relatives(model):
 
     mysql = "mysql"
     mysql_app = await model.deploy(
-        'cs:' + mysql, application_name=mysql,
-        series='trusty', config={}
+        'cs:percona-cluster', application_name=mysql,
+        series='bionic', config={}
     )
 
     mediawiki = "mediawiki"
@@ -237,8 +237,8 @@ async def deploy_app(relatives, model, series):
             'enable_pagerduty': False
         }
     )
-    await model.add_relation('{}:monitors'.format(app_name), 'mysql:monitors')
-    await model.add_relation('{}:nagios'.format(app_name), 'mediawiki:juju-info')
+    for relative in relatives.keys():
+        await model.add_relation(app_name + ':nagios', relative + ':juju-info')
     await model.add_relation('nrpe:monitors', '{}:monitors'.format(app_name))
     await model.block_until(lambda: nagios_app.status == "active")
     await model.block_until(lambda: all(