Merge lp:~cjwatson/charms/xenial/storage/fix-nfs into lp:~stub/charms/xenial/storage/trunk

[Colin Watson]

Drop idmapd reconfiguration from nfs provider. Declare bionic support.

There hasn't been a NEED_IDMAPD entry in /etc/default/nfs-common since at least precise (it's been unconditionally started where needed), and so we don't need to change it or restart idmapd. Furthermore, restarting idmapd fails as of vivid (it's called nfs-idmapd instead), and is superseded on the client side by nfsidmap in any case. With this I was able to deploy this on bionic as a subordinate for charms requiring NFS storage.

I don't really know if this is the best place to send this MP, but it was the only multi-series version I could find. Merging all the disparate versions together, maybe moving them into a storage-charm project, and getting an updated and unified version into the store would be nice ...

[lp:~cjwatson/charms/xenial/storage/fix-nfs]

43. By Colin Watson on 2018-12-17

Port to Python 3.

This should be safe on >= trusty, as cloud images contain python3, and
charm-helpers will bootstrap the rest as long as the hook #! line works.

I dropped unicode() from the data persistence functions, as it's
unnecessary: on Python 2 a file opened with "w" will accept str writes, and
on Python 3 json.dumps always returns str rather than bytes.

[Stuart Bishop (stub)]

Erm, ok.

Any bionic deployments should be using Juju storage rather than this charm as of Juju 2.5.2, after confirming lp:1783419 is fixed.

The code should move out of the charms/xenial namespace to a top level storage-charm project. That isn't your problem though, as the charm already is multi-series and in the wrong namespace. Whoever takes up maintenance of this charm can worry about that.

review: Approve

Unmerged revisions

43. By Colin Watson on 2018-12-17

Port to Python 3.

This should be safe on >= trusty, as cloud images contain python3, and
charm-helpers will bootstrap the rest as long as the hook #! line works.

I dropped unicode() from the data persistence functions, as it's
unnecessary: on Python 2 a file opened with "w" will accept str writes, and
on Python 3 json.dumps always returns str rather than bytes.

42. By Colin Watson on 2018-12-15

Declare bionic support.

41. By Colin Watson on 2018-12-15

Drop idmapd reconfiguration from nfs provider.

There hasn't been a NEED_IDMAPD entry in /etc/default/nfs-common since
at least precise (it's been unconditionally started where needed), and
so we don't need to change it or restart idmapd. Furthermore,
restarting idmapd fails as of vivid (it's called nfs-idmapd instead),
and is superseded on the client side by nfsidmap in any case.

=== modified file 'hooks/common_util.py'
--- hooks/common_util.py	2014-08-27 11:01:14 +0000
+++ hooks/common_util.py	2018-12-17 14:11:37 +0000
@@ -29,7 +29,7 @@
             data = json.load(inputfile)
     data[key] = value
     with open(filepath, "w") as outfile:
-        outfile.write(unicode(json.dumps(data, ensure_ascii=False)))
+        outfile.write(json.dumps(data, ensure_ascii=False))
 
 
 def _get_persistent_data(key=None, remove_values=False):
@@ -50,8 +50,7 @@
             data.pop(key, None)
             if data:
                 with open(filepath, "w") as outfile:
-                    outfile.write(
-                        unicode(json.dumps(data, ensure_ascii=False)))
+                    outfile.write(json.dumps(data, ensure_ascii=False))
             elif os.path.exists(filepath):
                 os.remove(filepath)
     else:
@@ -108,7 +107,7 @@
                 message = "WARNING: umount %s failed. Retrying." % mountpoint
                 try:
                     lsof = subprocess.check_output(["lsof", mountpoint])
-                except subprocess.CalledProcessError, e:
+                except subprocess.CalledProcessError as e:
                     log("WARNING: %s" % str(e), hookenv.WARNING)
                 else:
                     process_name = lsof.split("\n")[1].split()[0]
@@ -312,7 +311,7 @@
         metadata = subprocess.check_output(
             "curl %s/instance-id" % EC2_METADATA_URL, shell=True)
         return metadata.strip()
-    except subprocess.CalledProcessError, e:
+    except subprocess.CalledProcessError as e:
         log("Error: couldn't discover ec2 instance id. %s" % str(e),
             hookenv.ERROR)
         sys.exit(1)
@@ -337,7 +336,7 @@
             "curl %s/placement/availability-zone" % EC2_METADATA_URL,
             shell=True)
         return metadata.strip()
-    except subprocess.CalledProcessError, e:
+    except subprocess.CalledProcessError as e:
         log("Error: couldn't discover ec2 availability zone. %s" % str(e),
             hookenv.ERROR)
         sys.exit(1)

=== modified file 'hooks/storage-provider.d/block-storage-broker/block-storage-relation-broken'
--- hooks/storage-provider.d/block-storage-broker/block-storage-relation-broken	2014-02-11 17:34:15 +0000
+++ hooks/storage-provider.d/block-storage-broker/block-storage-relation-broken	2018-12-17 14:11:37 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import common_util
 

=== modified file 'hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed'
--- hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed	2014-03-07 08:01:15 +0000
+++ hooks/storage-provider.d/block-storage-broker/block-storage-relation-changed	2018-12-17 14:11:37 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import common_util
 import sys

=== modified file 'hooks/storage-provider.d/local/data-relation-changed'
--- hooks/storage-provider.d/local/data-relation-changed	2014-08-27 05:53:12 +0000
+++ hooks/storage-provider.d/local/data-relation-changed	2018-12-17 14:11:37 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys
 import os
 

=== modified file 'hooks/storage-provider.d/nfs/config-changed'
--- hooks/storage-provider.d/nfs/config-changed	2014-01-22 19:02:54 +0000
+++ hooks/storage-provider.d/nfs/config-changed	2018-12-17 14:11:37 +0000
@@ -7,6 +7,4 @@
     echo nfs-common already installed.
 else
     apt-get -y install -qq nfs-common
-    sed -i -e "s/NEED_IDMAPD.*/NEED_IDMAPD=yes/" /etc/default/nfs-common
 fi
-service idmapd restart || service idmapd start

=== modified file 'hooks/storage-provider.d/nfs/data-relation-changed'
--- hooks/storage-provider.d/nfs/data-relation-changed	2014-03-06 16:02:32 +0000
+++ hooks/storage-provider.d/nfs/data-relation-changed	2018-12-17 14:11:37 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import common_util
 

=== modified file 'hooks/storage-provider.d/nfs/data-relation-departed'
--- hooks/storage-provider.d/nfs/data-relation-departed	2014-02-10 18:34:02 +0000
+++ hooks/storage-provider.d/nfs/data-relation-departed	2018-12-17 14:11:37 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import common_util
 

=== modified file 'metadata.yaml'
--- metadata.yaml	2016-07-04 11:34:30 +0000
+++ metadata.yaml	2018-12-17 14:11:37 +0000
@@ -19,5 +19,6 @@
     block-storage:
         interface: volume-request
 series:
+    - bionic
     - xenial
     - trusty