Enable strict confinement for the ovs exporter (#80)

Now that the use of system-files interface has been approved and the prometheus-ovs-exporter snap with the relevant plugs has been released to the store, devmode usage can be disabled and additional connections can be made. Signed-off-by: Dmitrii Shcherbakov <[email protected]>
openstack-charmers · Oct 22, 2022 · a6dd5f5 · a6dd5f5
1 parent cad2e79
commit a6dd5f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/layer.yaml b/layer.yaml
@@ -29,8 +29,8 @@ options:
         - ['prometheus-ovs-exporter:network-observe', ':network-observe']
         - ['prometheus-ovs-exporter:openvswitch', ':openvswitch']
         - ['prometheus-ovs-exporter:system-observe', ':system-observe']
-        # - ['prometheus-ovs-exporter:etc-openvswitch', ':system-files']
-        # - ['prometheus-ovs-exporter:run-openvswitch', ':system-files']
+        - ['prometheus-ovs-exporter:etc-openvswitch', ':system-files']
+        - ['prometheus-ovs-exporter:run-openvswitch', ':system-files']
 repo: https://github.com/openstack-charmers/charm-layer-ovn
 config:
   deletes:

diff --git a/lib/charms/ovn_charm.py b/lib/charms/ovn_charm.py
@@ -1420,9 +1420,7 @@ def assess_exporter(self):
             return
 
         if is_installed:
-            snap.refresh('prometheus-ovs-exporter', channel=channel,
-                         devmode=True)
+            snap.refresh('prometheus-ovs-exporter', channel=channel)
         else:
-            snap.install('prometheus-ovs-exporter', channel=channel,
-                         devmode=True)
+            snap.install('prometheus-ovs-exporter', channel=channel)
         snap.connect_all()
diff --git a/unit_tests/test_lib_charms_ovn_charm.py b/unit_tests/test_lib_charms_ovn_charm.py
@@ -1754,8 +1754,7 @@ def test_assess_exporter_fresh_install(self):
 
         self.install.assert_called_once_with(
             'prometheus-ovs-exporter',
-            channel='stable',
-            devmode=True)
+            channel='stable')
         self.remove.assert_not_called()
         self.refresh.assert_not_called()
 
@@ -1771,8 +1770,7 @@ def test_assess_exporter_refresh(self):
 
         self.refresh.assert_called_once_with(
             'prometheus-ovs-exporter',
-            channel='stable',
-            devmode=True)
+            channel='stable')
         self.install.assert_not_called()
         self.remove.assert_not_called()