Merge bootstack-ops:fix_juju_backups into bootstack-ops:master

[Craige McWhirter]

Adding the removal of backups from juju itself

This patches added the removal backups from the juju controller itself.

Tested against Juju v2.3.2-xenial-amd64 (charmlab). No support for Juju 1.x as I didn't see any other support for 1.x in the script and assumed it was considered redundant for this script.

Also removed superfluous white spaces (automated via vim).

[James Hebden (ec0)]

LGTM. Also, your assumption around Juju 1.25 support in the new ops bundle is correct. It only supports Juju 2.0+

review: Approve

diff --git a/bootstack-ops/backup.py b/bootstack-ops/backup.py
index 464be31..71753fb 100755
--- a/bootstack-ops/backup.py
+++ b/bootstack-ops/backup.py
@@ -14,7 +14,7 @@ from juju.unit import Unit
 from juju.model import Model,ModelEntity
 import os
 import argparse
-import datetime 
+import datetime
 import tarfile
 
 async def juju_backup( path, date ):
@@ -38,8 +38,20 @@ async def juju_backup( path, date ):
         backup_proc = await asyncio.create_subprocess_shell(command)
         await backup_proc.wait()
 
+        # Remove the backups from the juju controller itself
+        remove_command = "for backup in " \
+                         "$(juju list-backups -m {0} | sort | head -n -5); " \
+                         "do juju remove-backup $backup -m {0}; done" \
+                         .format(model)
+        print(remove_command)
+
+        remove_backup_proc = await \
+            asyncio.create_subprocess_shell(remove_command)
+        await remove_backup_proc.wait()
+
+
 async def juju_client_backup( path, date ):
-    
+
     filename = "{}/juju-client-backup-{}.tar.gz".format( path, date )
 
     print ("Backing up juju client settings to {}...".format( filename ))
@@ -48,7 +60,7 @@ async def juju_client_backup( path, date ):
         tar.add(os.path.expanduser("~/.local/share/juju"))
 
     print ("Juju client settings backed up.")
-    
+
 
 async def swift_backup(path, date):
 
@@ -66,7 +78,7 @@ async def swift_backup(path, date):
         print("No swift-proxy/0 unit");
         return
 
-    await swift_proxy.run("echo hello");  
+    await swift_proxy.run("echo hello");
 
     print("Done backing up swift.")