Merge lp:~moon127/charms/precise/storage/fstab-fix into lp:charms/storage

[Gareth Woolridge]

Fix fstab when using default options, "default" is not valid option in fstab and causes the instance to fail to reboot successfully. Updated this to "defaults" which is valid.

Also add newline to fstab entry, fixes warning from mount -a.

[Adam Israel (aisrael)]

Hi Gareth, thanks for submitting this charm for review! I've stepped through the initial review process and the charm looks good. +1 from me.

review: Approve

[Charles Butler (lazypower)]

+1 LGTM

Thank you for the submission Gareth!

review: Approve

=== modified file 'hooks/common_util.py'
--- hooks/common_util.py	2014-03-21 22:53:22 +0000
+++ hooks/common_util.py	2014-08-27 11:29:29 +0000
@@ -236,7 +236,7 @@
                 relid, relation_settings={"mountpoint": mountpoint})
         return
 
-    options = "default"
+    options = "defaults"
     provider = get_provider()
     if provider == "nfs":
         relids = hookenv.relation_ids("nfs")
@@ -247,7 +247,7 @@
                 nfs_server = relation.get("private-address", None)
                 nfs_path = relation.get("mountpoint", None)
                 fstype = relation.get("fstype", None)
-                options = relation.get("options", "default")
+                options = relation.get("options", "defaults")
                 break
 
         if len(relids) == 0 or None in [nfs_server, nfs_path, fstype]:
@@ -282,14 +282,14 @@
     if not os.path.exists(mountpoint):
         os.makedirs(mountpoint)
 
-    options_string = "" if options == "default" else " -o %s" % options
+    options_string = "" if options == "defaults" else " -o %s" % options
     command = "mount -t %s%s %s %s" % (
         fstype, options_string, device_path, mountpoint)
     subprocess.check_call(command, shell=True)
     log("Mount (%s) successful" % mountpoint)
     with open(FSTAB_FILE, "a") as output_file:
         output_file.write(
-            "%s %s %s %s 0 0" % (device_path, mountpoint, fstype, options))
+            "%s %s %s %s 0 0\n" % (device_path, mountpoint, fstype, options))
     # publish changes to data relation and exit
     for relid in hookenv.relation_ids("data"):
         hookenv.relation_set(