Merge "Trigger upgrades on source changes"

src/lib/charm/openstack/dmapi.py

@@ -13,9 +13,9 @@
 import collections
 import os
 
-import charms_openstack.charm as charm
 import charms_openstack.adapters as adapters
 import charms_openstack.ip as os_ip
+import charms_openstack.plugins as plugins
 
 import charmhelpers.contrib.openstack.utils as ch_utils
 import charmhelpers.core.hookenv as hookenv
@@ -51,7 +51,7 @@ class DmapiAdapters(adapters.OpenStackAPIRelationAdapters):
     }
 
 
-class DmapiCharm(charm.HAOpenStackCharm):
+class DmapiCharm(plugins.TrilioVaultCharm):
 
     # Internal name of charm + keystone endpoint
     service_name = "dmapi"
@@ -113,13 +113,6 @@ class DmapiCharm(charm.HAOpenStackCharm):
             release = ch_utils.os_release("python-keystonemiddleware")
         super(DmapiCharm, self).__init__(release=release, **kwargs)
 
-    def configure_source(self):
-        with open(
-            "/etc/apt/sources.list.d/" "trilio-gemfury-sources.list", "w"
-        ) as tsources:
-            tsources.write(hookenv.config("triliovault-pkg-source"))
-        super().configure_source()
-
     def get_amqp_credentials(self):
         return ("dmapi", "openstack")
 

src/reactive/dmapi_handlers.py

@@ -64,3 +64,4 @@ def cluster_connected(hacluster):
 def install_source_changed():
     """Trigger re-install of charm if source configuration options change"""
     reactive.clear_flag("charm.installed")
+    reactive.set_flag("upgrade.triliovault")