← Back to team overview

livepatch-charmers team mailing list archive

[Merge] ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master

 

Barry Price has proposed merging ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

Commit message:
Replace postgresql wih mongodb as our amulet test primary, add charm actions to activate/deactive livepatch on individual units

Requested reviews:
  Livepatch charm developers (livepatch-charmers)
Related bugs:
  Bug #1671934 in Canonical Livepatch Charm: "Add action to enable/disable livepatch"
  https://bugs.launchpad.net/canonical-livepatch-charm/+bug/1671934

For more details, see:
https://code.launchpad.net/~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm/+merge/326983
-- 
Your team Livepatch charm developers is requested to review the proposed merge of ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.
diff --git a/tests/99-autogen b/tests/99-autogen
index 7bc8f1e..c7c1dfd 100755
--- a/tests/99-autogen
+++ b/tests/99-autogen
@@ -10,8 +10,8 @@ class TestDeployment(unittest.TestCase):
     def setUpClass(cls):
         cls.deployment = amulet.Deployment(series='xenial')
 
-        # deploy postgresql as our parent, it's a well-behaved charm
-        cls.deployment.add('postgresql')
+        # deploy mongodb as our parent
+        cls.deployment.add('mongodb')
 
         # deploy our own charm
         cls.deployment.add('canonical-livepatch')
@@ -19,13 +19,18 @@ class TestDeployment(unittest.TestCase):
         # and deploy the nrpe subordinate to test nagios checks
         cls.deployment.add('nrpe')
 
+        # set nrpe to export its definitions
+        cls.deployment.configure('nrpe', {
+            'export_nagios_definitions': True,
+        })
+
         # relate subordinates to parent charm
         cls.deployment.relate(
-            'postgresql:juju-info',
+            'mongodb:juju-info',
             'canonical-livepatch:juju-info'
         )
         cls.deployment.relate(
-            'postgresql:nrpe-external-master',
+            'mongodb:nrpe-external-master',
             'nrpe:nrpe-external-master'
         )
 

Follow ups