Merge ~afreiberger/charm-glance-sync:blacken-20.08 into charm-glance-sync:master

[Drew Freiberger]

Blackened repository to 88 lines and fixed up lint

[Xav Paice (xavpaice)]

LGTM

review: Approve

diff --git a/src/files/check_stale_lockfile_master.py b/src/files/check_stale_lockfile_master.py
index bd6aa3d..341441d 100644
--- a/src/files/check_stale_lockfile_master.py
+++ b/src/files/check_stale_lockfile_master.py
@@ -5,20 +5,25 @@ import os.path
 import sys
 import time
 
-('Check the status of lock file to be sure it is not stale, '
- 'warn at 7200 seconds crit at 14400 seconds')
+(
+    "Check the status of lock file to be sure it is not stale, "
+    "warn at 7200 seconds crit at 14400 seconds"
+)
 
 parser = optparse.OptionParser()
 parser.add_option(
-    '-w', action='store', default='7200', help='seconds to warn', type='int')
+    "-w", action="store", default="7200", help="seconds to warn", type="int"
+)
 parser.add_option(
-    '-c', action='store', default='14400', help='seconds to crit', type='int')
+    "-c", action="store", default="14400", help="seconds to crit", type="int"
+)
 parser.add_option(
-    '-f',
-    action='store',
-    default='/tmp/glance_sync_master.lock',
-    help='file to check',
-    type='string')
+    "-f",
+    action="store",
+    default="/tmp/glance_sync_master.lock",
+    help="file to check",
+    type="string",
+)
 
 options, args = parser.parse_args()
 
@@ -29,7 +34,7 @@ nagCrit = 2
 try:
     statInfo = os.stat(options.f)
 except OSError:
-    print('OK: lockfile {} not present'.format(options.f))
+    print("OK: lockfile {} not present".format(options.f))
     sys.exit(nagOk)
 
 now = int(time.time())
@@ -37,11 +42,11 @@ statInfoSlice = statInfo[8]
 timeDiff = now - statInfoSlice
 
 if timeDiff > options.c:
-    print('CRIT: lock file is older than {} seconds'.format(options.c))
+    print("CRIT: lock file is older than {} seconds".format(options.c))
     sys.exit(nagCrit)
 elif timeDiff > options.w:
-    print('WARN: lock file is older than {} seconds'.format(options.w))
+    print("WARN: lock file is older than {} seconds".format(options.w))
     sys.exit(nagWarn)
 else:
-    print('OK: lock file is under 3 hours')
+    print("OK: lock file is under 3 hours")
     sys.exit(nagOk)
diff --git a/src/files/check_stale_lockfile_slave.py b/src/files/check_stale_lockfile_slave.py
index 1be8b9b..08412be 100644
--- a/src/files/check_stale_lockfile_slave.py
+++ b/src/files/check_stale_lockfile_slave.py
@@ -5,20 +5,25 @@ import os.path
 import sys
 import time
 
-('Check the status of lock file to be sure it is not stale, '
- 'warn at 7200 seconds crit at 14400 seconds')
+(
+    "Check the status of lock file to be sure it is not stale, "
+    "warn at 7200 seconds crit at 14400 seconds"
+)
 
 parser = optparse.OptionParser()
 parser.add_option(
-    '-w', action='store', default='7200', help='seconds to warn', type='int')
+    "-w", action="store", default="7200", help="seconds to warn", type="int"
+)
 parser.add_option(
-    '-c', action='store', default='14400', help='seconds to crit', type='int')
+    "-c", action="store", default="14400", help="seconds to crit", type="int"
+)
 parser.add_option(
-    '-f',
-    action='store',
-    default='/tmp/glance_sync_slave.lock',
-    help='file to check',
-    type='string')
+    "-f",
+    action="store",
+    default="/tmp/glance_sync_slave.lock",
+    help="file to check",
+    type="string",
+)
 
 options, args = parser.parse_args()
 
@@ -29,7 +34,7 @@ nagCrit = 2
 try:
     statInfo = os.stat(options.f)
 except OSError:
-    print('OK: lockfile {} not present'.format(options.f))
+    print("OK: lockfile {} not present".format(options.f))
     sys.exit(nagOk)
 
 now = int(time.time())
@@ -37,11 +42,11 @@ statInfoSlice = statInfo[8]
 timeDiff = now - statInfoSlice
 
 if timeDiff > options.c:
-    print('CRIT: lock file is older than {} seconds'.format(options.c))
+    print("CRIT: lock file is older than {} seconds".format(options.c))
     sys.exit(nagCrit)
 elif timeDiff > options.w:
-    print('WARN: lock file is older than {} seconds'.format(options.w))
+    print("WARN: lock file is older than {} seconds".format(options.w))
     sys.exit(nagWarn)
 else:
-    print('OK: lock file is under 3 hours')
+    print("OK: lock file is under 3 hours")
     sys.exit(nagOk)
diff --git a/src/files/db_purge_deleted_master/db_purge_deleted_glance_images.py b/src/files/db_purge_deleted_master/db_purge_deleted_glance_images.py
index 144383f..bbc97c6 100644
--- a/src/files/db_purge_deleted_master/db_purge_deleted_glance_images.py
+++ b/src/files/db_purge_deleted_master/db_purge_deleted_glance_images.py
@@ -30,27 +30,28 @@ config = {}
 
 # pull connection information from glance-api.conf
 try:
-    with open('/etc/glance/glance-api.conf', 'r') as conf_file:
+    with open("/etc/glance/glance-api.conf", "r") as conf_file:
         for line in conf_file.readlines():
-            if line.startswith('connection ='):
+            if line.startswith("connection ="):
                 # connection = mysql://glance:<password>@<host>/glance
-                connection = urlparse.urlparse(line.split('=')[1].strip())
-                config['host'] = connection.hostname
-                config['user'] = connection.username
-                config['password'] = connection.password
-                config['database'] = connection.path[1:].strip()
+                connection = urlparse.urlparse(line.split("=")[1].strip())
+                config["host"] = connection.hostname
+                config["user"] = connection.username
+                config["password"] = connection.password
+                config["database"] = connection.path[1:].strip()
                 break
 except IOError as e:
     sys.exit(e)
 
 try:
     connection = MySQLdb.connect(
-        host=config['host'],
-        user=config['user'],
-        passwd=config['password'],
-        db=config['database'])
+        host=config["host"],
+        user=config["user"],
+        passwd=config["password"],
+        db=config["database"],
+    )
 except Exception as e:
-    print('ERROR: unable to connect to mysql database')
+    print("ERROR: unable to connect to mysql database")
     sys.exit(e)
 
 cursor = connection.cursor()
@@ -60,14 +61,14 @@ cursor.execute("SELECT id FROM glance.images WHERE status='deleted';")
 image_ids = cursor.fetchall()
 
 for image_id in image_ids:
-    print('purging {}'.format(image_id[0]))
-    args = (image_id[0])
+    print("purging {}".format(image_id[0]))
+    args = image_id[0]
     commands = [
-        'DELETE FROM glance.image_properties WHERE image_id=%s;',
-        'DELETE FROM glance.image_members WHERE image_id=%s;',
-        'DELETE FROM glance.image_tags WHERE image_id=%s;',
-        'DELETE FROM glance.image_locations WHERE image_id=%s;',
-        'DELETE FROM glance.images WHERE id=%s;'
+        "DELETE FROM glance.image_properties WHERE image_id=%s;",
+        "DELETE FROM glance.image_members WHERE image_id=%s;",
+        "DELETE FROM glance.image_tags WHERE image_id=%s;",
+        "DELETE FROM glance.image_locations WHERE image_id=%s;",
+        "DELETE FROM glance.images WHERE id=%s;",
     ]
 
     for command in commands:
diff --git a/src/files/db_purge_deleted_slave/db_purge_deleted_glance_images.py b/src/files/db_purge_deleted_slave/db_purge_deleted_glance_images.py
index c0acc47..74f57be 100644
--- a/src/files/db_purge_deleted_slave/db_purge_deleted_glance_images.py
+++ b/src/files/db_purge_deleted_slave/db_purge_deleted_glance_images.py
@@ -27,10 +27,11 @@ from contextlib import closing
 import mysql.connector as mysql
 
 con = mysql.connect(
-    host=os.environ['OS_MYSQL_HOST'],
-    user=os.environ['OS_MYSQL_USER'],
-    password=os.environ['OS_MYSQL_PASS'],
-    database=os.environ['OS_MYSQL_DB'])
+    host=os.environ["OS_MYSQL_HOST"],
+    user=os.environ["OS_MYSQL_USER"],
+    password=os.environ["OS_MYSQL_PASS"],
+    database=os.environ["OS_MYSQL_DB"],
+)
 
 # delete from images where status = 'deleted'
 with closing(con.cursor()) as cur:
@@ -38,15 +39,14 @@ with closing(con.cursor()) as cur:
     cur.execute(sql)
     image_ids = cur.fetchall()
     for image_id in image_ids:
-        print('purging {}'.format(image_id[0]))
-        args = (image_id[0])
+        print("purging {}".format(image_id[0]))
+        args = image_id[0]
         commands = [
-            "DELETE FROM glance.image_properties WHERE image_id='{}';".format(
-                args), "DELETE FROM glance.image_members WHERE image_id='{}';".
-            format(args),
+            "DELETE FROM glance.image_properties WHERE image_id='{}';".format(args),
+            "DELETE FROM glance.image_members WHERE image_id='{}';".format(args),
             "DELETE FROM glance.image_tags WHERE image_id='{}';".format(args),
-            "DELETE FROM glance.image_locations WHERE image_id='{}';".format(
-                args), "DELETE FROM glance.images WHERE id='{}';".format(args)
+            "DELETE FROM glance.image_locations WHERE image_id='{}';".format(args),
+            "DELETE FROM glance.images WHERE id='{}';".format(args),
         ]
 
         for command in commands:
diff --git a/src/files/glance_sync_master.py b/src/files/glance_sync_master.py
index 57139b3..5cd53b5 100755
--- a/src/files/glance_sync_master.py
+++ b/src/files/glance_sync_master.py
@@ -20,31 +20,33 @@ from keystoneclient.v3 import client as keystone_v3_client
 
 def get_keystone_client():
     # We know that we set OS_AUTH_VERSION, so use it (and cast to int)
-    if int(os.environ['OS_AUTH_VERSION']) == 3:
+    if int(os.environ["OS_AUTH_VERSION"]) == 3:
         ksc = keystone_v3_client.Client(
-            auth_url=os.environ['OS_AUTH_URL'],
-            username=os.environ['OS_USERNAME'],
-            password=os.environ['OS_PASSWORD'],
-            user_domain_name=os.environ['OS_USER_DOMAIN_NAME'],
-            project_domain_name=os.environ['OS_PROJECT_DOMAIN_NAME'],
-            project_name=os.environ['OS_PROJECT_NAME'])
+            auth_url=os.environ["OS_AUTH_URL"],
+            username=os.environ["OS_USERNAME"],
+            password=os.environ["OS_PASSWORD"],
+            user_domain_name=os.environ["OS_USER_DOMAIN_NAME"],
+            project_domain_name=os.environ["OS_PROJECT_DOMAIN_NAME"],
+            project_name=os.environ["OS_PROJECT_NAME"],
+        )
     else:
         ksc = keystone_v2_client.Client(
-            username=os.environ['OS_USERNAME'],
-            password=os.environ['OS_PASSWORD'],
-            tenant_name=os.environ['OS_TENANT_NAME'],
-            auth_url=os.environ['OS_AUTH_URL'])
+            username=os.environ["OS_USERNAME"],
+            password=os.environ["OS_PASSWORD"],
+            tenant_name=os.environ["OS_TENANT_NAME"],
+            auth_url=os.environ["OS_AUTH_URL"],
+        )
     return ksc
 
 
 def get_glance_client(ksc):
     # create a glance client, using the provided keystone client for details
     token = ksc.auth_token
-    service = ksc.services.find(name='glance')
-    endpoint = ksc.endpoints.find(service_id=service.id, interface='internal')
+    service = ksc.services.find(name="glance")
+    endpoint = ksc.endpoints.find(service_id=service.id, interface="internal")
     glance_url = endpoint.url
 
-    return GlanceClient('2', endpoint=glance_url, token=token)
+    return GlanceClient("2", endpoint=glance_url, token=token)
 
 
 class BootStackMetadataError(Exception):
@@ -54,14 +56,15 @@ class BootStackMetadataError(Exception):
             helps map different tenants between regions (with
            different tenant-id, but same/similar tenant-name
     """
+
     pass
 
 
 class ImageSyncMaster:
-    def __init__(self, data_dir='/srv/glance_master_sync/data'):
+    def __init__(self, data_dir="/srv/glance_master_sync/data"):
         self.tenants = {}
         self.DATA_DIR = data_dir
-        tmp_dir = '/tmp/glance_master_sync'
+        tmp_dir = "/tmp/glance_master_sync"
         if not os.path.isdir(tmp_dir):
             os.makedirs(tmp_dir)
 
@@ -71,76 +74,81 @@ class ImageSyncMaster:
     def glance_connect(self):
         try:
 
-            self.log('connecting to Keystone')
+            self.log("connecting to Keystone")
             self.keystone = get_keystone_client()
         except Exception as e:
-            self.log('EXCEPTION: {0}'.format(e))
+            self.log("EXCEPTION: {0}".format(e))
             sys.exit(2)
         if not self.tenants:
             # In the call to keystone we know that we get a list response.
             # 1st element is the response code, 2nd is the data in dicts form
             self.tenants = dict(
-                [(tenant['id'], tenant['name'])
-                 for tenant in self.keystone.get('/projects')[1]['projects']
-                 if tenant['enabled']])
+                [
+                    (tenant["id"], tenant["name"])
+                    for tenant in self.keystone.get("/projects")[1]["projects"]
+                    if tenant["enabled"]
+                ]
+            )
             self.glance = get_glance_client(self.keystone)
         return self.glance
 
     def timestamp_now(self):
-        return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
     def log(self, msg):
-        print('{0} {1}'.format(self.timestamp_now(), msg))
+        print("{0} {1}".format(self.timestamp_now(), msg))
 
     def delete_files(self, existing_images_ids):
         if not existing_images_ids:
-            self.log('WARNING: precautionary halt. '
-                     'No glance images found. noop.')
+            self.log("WARNING: precautionary halt. No glance images found. noop.")
             return
 
         for dirpath, dirnames, filenames in os.walk(self.DATA_DIR):
-            if dirpath != self.DATA_DIR and \
-               len(dirnames) == 0 and \
-               len(filenames) == 0:
+            if dirpath != self.DATA_DIR and len(dirnames) == 0 and len(filenames) == 0:
                 os.rmdir(dirpath)
                 continue
 
             for filename in filenames:
                 full_path = os.path.join(dirpath, filename)
-                if filename.endswith('.json.tmp'):
-                    self.log('WARNING: temporary file skipped. Please check '
-                             '{0}'.format(full_path))
+                if filename.endswith(".json.tmp"):
+                    self.log(
+                        "WARNING: temporary file skipped. Please check "
+                        "{0}".format(full_path)
+                    )
                     continue
-                elif filename.endswith('.json') and \
-                        filename[:-5] in existing_images_ids:
+                elif (
+                    filename.endswith(".json") and filename[:-5] in existing_images_ids
+                ):
                     continue
                 else:
-                    self.log('INFO: image not found in glance - deleting '
-                             '{0}'.format(full_path))
+                    self.log(
+                        "INFO: image not found in glance - deleting "
+                        "{0}".format(full_path)
+                    )
                     os.remove(full_path)
 
     def create_lock(self, lockfile):
         try:
             os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_RDWR)
         except OSError:
-            self.log('ERROR: could not create lockfile {}'.format(lockfile))
+            self.log("ERROR: could not create lockfile {}".format(lockfile))
 
-    def file_locked(self, lockfile='/tmp/glance_sync_master.lock'):
+    def file_locked(self, lockfile="/tmp/glance_sync_master.lock"):
         if os.path.isfile(lockfile):
             return True
         else:
             return False
 
-    def release_lock(self, lockfile='/tmp/glance_sync_master.lock'):
+    def release_lock(self, lockfile="/tmp/glance_sync_master.lock"):
         if os.path.isfile(lockfile):
             try:
                 os.remove(lockfile)
             except OSError as e:
                 self.log(e)
 
-    def set_filelock(self, lockfile='/tmp/glance_sync_master.lock'):
+    def set_filelock(self, lockfile="/tmp/glance_sync_master.lock"):
         if self.file_locked(lockfile):
-            self.log('WARNING: sync already in progress, exiting')
+            self.log("WARNING: sync already in progress, exiting")
             sys.exit(2)
 
         self.create_lock(lockfile)
@@ -152,21 +160,20 @@ class ImageSyncMaster:
             len(image.id) < 2 : DATA_DIR/<image-id>.json
             len(image.id) >= 2: DATA_DIR/XX/XXZZZ.json
         """
-        self.log('getting image from database.')
+        self.log("getting image from database.")
         existing_images = self.get_community_images_from_database()
-        self.log('Extending with data from api.')
+        self.log("Extending with data from api.")
         for image in self.glance.images.list():
             existing_images.add(image.id)
 
         for image_helper in existing_images:
             image = self.glance.images.get(image_helper)
-            if len(image['id']) < 2:
-                basename = '{0}.json'.format(image['id'])
+            if len(image["id"]) < 2:
+                basename = "{0}.json".format(image["id"])
             else:
-                basename = '{0}/{1}.json'.format(
-                    str(image['id'])[:2], image['id'])
+                basename = "{0}/{1}.json".format(str(image["id"])[:2], image["id"])
             filename = os.path.join(self.DATA_DIR, basename)
-            if not self.is_latest_metadata(filename, image['updated_at']):
+            if not self.is_latest_metadata(filename, image["updated_at"]):
                 self.update_metadata(filename, image)
 
         return existing_images
@@ -181,31 +188,32 @@ class ImageSyncMaster:
             with open(filename) as meta_file:
                 try:
                     data = json.load(meta_file)
-                    local_updated_at = data['updated_at']
-                    imageid = data['id']
+                    local_updated_at = data["updated_at"]
+                    imageid = data["id"]
                 except Exception as e:
-                    self.log('EXCEPTION: {0}'.format(e))
+                    self.log("EXCEPTION: {0}".format(e))
                     return False
 
             local_dup = dateutil.parser.parse(local_updated_at)
             glance_dup = dateutil.parser.parse(glance_updated_at)
 
             if local_dup >= glance_dup:
-                self.log('INFO: {0} up to date'.format(imageid))
+                self.log("INFO: {0} up to date".format(imageid))
                 return True
             else:
-                self.log('INFO: {0} outdated. Re-creating local '
-                         'copy of the metadata'.format(imageid))
+                self.log(
+                    "INFO: {0} outdated. Re-creating local "
+                    "copy of the metadata".format(imageid)
+                )
         else:
-            self.log('INFO: {0} not found. Creating a local '
-                     'copy'.format(filename))
+            self.log("INFO: {0} not found. Creating a local copy".format(filename))
             return False
 
     def update_metadata(self, filename, glance_metadata):
         """creates or replaces file with image metadata
            creates subdirectory if it doesn't exist
         """
-        tmp_file = '{0}.tmp'.format(filename)
+        tmp_file = "{0}.tmp".format(filename)
 
         if not os.path.exists(os.path.dirname(filename)):
             os.mkdir(os.path.dirname(filename), 0o750)
@@ -216,32 +224,34 @@ class ImageSyncMaster:
             self.log(e)
             return False
 
-        with open(tmp_file, 'w') as f:
+        with open(tmp_file, "w") as f:
             json.dump(glance_metadata, f, indent=4, ensure_ascii=False)
 
         os.rename(tmp_file, filename)
-        self.log('INFO: update_metadata :: {0}'.format(filename))
+        self.log("INFO: update_metadata :: {0}".format(filename))
         return True
 
     def add_bs_metadata_keys(self, glance_metadata):
-        keys = [k for k in glance_metadata if k.startswith('bs_')]
-        if 'bs_owner' in keys:
-            msg = 'WARNING: bs_owner metadata should not exist (image: ' \
-                  '{0}; bs_owner: {1})'.format(glance_metadata.id,
-                                               glance_metadata.bs_owner)
+        keys = [k for k in glance_metadata if k.startswith("bs_")]
+        if "bs_owner" in keys:
+            msg = (
+                "WARNING: bs_owner metadata should not exist (image: "
+                "{0}; bs_owner: {1})".format(
+                    glance_metadata.id, glance_metadata.bs_owner
+                )
+            )
             raise BootStackMetadataError(msg)
-        elif glance_metadata['owner'] in self.tenants:
-            glance_metadata['bs_owner'] = self.tenants[
-                glance_metadata['owner']]
+        elif glance_metadata["owner"] in self.tenants:
+            glance_metadata["bs_owner"] = self.tenants[glance_metadata["owner"]]
         return glance_metadata
 
     def main(self):
-        self.log('starting glance sync')
+        self.log("starting glance sync")
         # updates local metadata files if outdated
         existing_images = self.parse_glance_images()
         # removes local metadata files from deleted images
         self.delete_files(existing_images)
-        self.log('ending glance sync')
+        self.log("ending glance sync")
         self.release_lock()
 
     def get_community_images_from_database(self):
@@ -249,34 +259,37 @@ class ImageSyncMaster:
 
         db_img_list = list()
         con = mysql.connect(
-            host=os.environ['OS_MYSQL_HOST'],
-            user=os.environ['OS_MYSQL_USER'],
-            password=os.environ['OS_MYSQL_PASS'],
-            database=os.environ['OS_MYSQL_DB'])
+            host=os.environ["OS_MYSQL_HOST"],
+            user=os.environ["OS_MYSQL_USER"],
+            password=os.environ["OS_MYSQL_PASS"],
+            database=os.environ["OS_MYSQL_DB"],
+        )
         with closing(con.cursor()) as cur:
-            sql = 'SELECT id, name FROM images WHERE deleted = 0 AND ' \
-                  "visibility = 'community'"
+            sql = (
+                "SELECT id, name FROM images WHERE deleted = 0 AND "
+                "visibility = 'community'"
+            )
             cur.execute(sql)
             for (id, name) in cur.fetchall():
                 self.log(
-                    'Retrieved community image with id [{}] and name [{}] '
-                    'from database'.format(id, name))
+                    "Retrieved community image with id [{}] and name [{}] "
+                    "from database".format(id, name)
+                )
                 db_img_list.append(id)
 
         return set(db_img_list)
 
 
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Synchronize glance images '
-                                     'to disk ')
-    parser.add_argument('-d', '--datadir', help='directory to write images to')
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Synchronize glance images to disk ")
+    parser.add_argument("-d", "--datadir", help="directory to write images to")
     args = parser.parse_args()
 
     if args.datadir:
         data_dir = args.datadir
     else:
         parser.print_help()
-        sys.exit('ERROR: please specify an output directory for images')
+        sys.exit("ERROR: please specify an output directory for images")
 
     master = ImageSyncMaster(data_dir)
     master.main()
diff --git a/src/files/glance_sync_slave.py b/src/files/glance_sync_slave.py
index 702b362..daf6dc6 100755
--- a/src/files/glance_sync_slave.py
+++ b/src/files/glance_sync_slave.py
@@ -10,6 +10,7 @@ import json
 import datetime
 import dateutil.parser
 import atexit
+
 # import re
 import shlex
 import os_client_config
@@ -22,61 +23,70 @@ class OSProjectNotFound(Exception):
     """This indicates no sync is possible
     (not defaulting to admin project)
     """
+
     pass
 
 
 class ImageSyncSlave:
-    extra_properties = set(['bs_owner'])
-    glance_properties = set(["architecture",
-                             "checksum",
-                             "container_format",
-                             "created_at",
-                             "deleted",
-                             "deleted_at",
-                             "direct_url",
-                             "disk_format",
-                             "file",
-                             "id",
-                             "instance_uuid",
-                             "kernel_id",
-                             "locations",
-                             "min_disk",
-                             "min_ram",
-                             "name",
-                             "os_distro",
-                             "os_version",
-                             "owner",
-                             "protected",
-                             "ramdisk_id",
-                             "schema",
-                             "self",
-                             "size",
-                             "status",
-                             "tags",
-                             "updated_at",
-                             "virtual_size",
-                             "visibility"])
+    extra_properties = set(["bs_owner"])
+    glance_properties = set(
+        [
+            "architecture",
+            "checksum",
+            "container_format",
+            "created_at",
+            "deleted",
+            "deleted_at",
+            "direct_url",
+            "disk_format",
+            "file",
+            "id",
+            "instance_uuid",
+            "kernel_id",
+            "locations",
+            "min_disk",
+            "min_ram",
+            "name",
+            "os_distro",
+            "os_version",
+            "owner",
+            "protected",
+            "ramdisk_id",
+            "schema",
+            "self",
+            "size",
+            "status",
+            "tags",
+            "updated_at",
+            "virtual_size",
+            "visibility",
+        ]
+    )
     # egrep -B2 readOnly glanceclient/v2/image_schema.py | \
     #       awk '/\{/ {print $1}' | tr -d \":
-    readonly_properties = set(['file',
-                               'size',
-                               'status',
-                               'self',
-                               'direct_url',
-                               'schema',
-                               'updated_at',
-                               'locations',
-                               'virtual_size',
-                               'checksum',
-                               'created_at'])
+    readonly_properties = set(
+        [
+            "file",
+            "size",
+            "status",
+            "self",
+            "direct_url",
+            "schema",
+            "updated_at",
+            "locations",
+            "virtual_size",
+            "checksum",
+            "created_at",
+        ]
+    )
 
     def __init__(self, data_dir, source):
         self.projects_slave = {}
         self.DATA_DIR = data_dir
         self.SOURCE = source
         self.valid_properties = self.glance_properties.difference(
-            self.readonly_properties.union(
-                self.extra_properties))
+            self.readonly_properties.union(self.extra_properties)
+        )
         self.set_filelock()
         self.glance_connect_slave()
         self.glance_connect_master()
@@ -84,22 +94,25 @@ class ImageSyncSlave:
     def download_metadata_from_master(self):
         """rsync metadata files from source to data_dir"""
 
-        if not self.SOURCE.endswith('/'):
-            self.SOURCE += '/'
-        if not self.DATA_DIR.endswith('/'):
-            self.DATA_DIR += '/'
-
-        command = '/usr/bin/rsync -az --delete -e ' \
-                  "'ssh -o StrictHostKeyChecking=no' " \
-                  '{0} {1}'.format(self.SOURCE, self.DATA_DIR)
-        proc = subprocess.Popen(shlex.split(command),
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
+        if not self.SOURCE.endswith("/"):
+            self.SOURCE += "/"
+        if not self.DATA_DIR.endswith("/"):
+            self.DATA_DIR += "/"
+
+        command = (
+            "/usr/bin/rsync -az --delete -e "
+            "'ssh -o StrictHostKeyChecking=no' "
+            "{0} {1}".format(self.SOURCE, self.DATA_DIR)
+        )
+        proc = subprocess.Popen(
+            shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
         (stdout, stderr) = proc.communicate()
         if proc.returncode:
-            self.log('ERROR: problem while getting data from master '
-                     '({0})'.format(command))
-            self.log('ERROR: {0}'.format(stderr))
+            self.log(
+                "ERROR: problem while getting data from master ({0})".format(command)
+            )
+            self.log("ERROR: {0}".format(stderr))
             self.release_lock()
             sys.exit(2)
         else:
@@ -111,17 +124,22 @@ class ImageSyncSlave:
 
         db_img_list = list()
         con = mysql.connect(
-            host=os.environ['OS_MYSQL_HOST'],
-            user=os.environ['OS_MYSQL_USER'],
-            password=os.environ['OS_MYSQL_PASS'],
-            database=os.environ['OS_MYSQL_DB'])
+            host=os.environ["OS_MYSQL_HOST"],
+            user=os.environ["OS_MYSQL_USER"],
+            password=os.environ["OS_MYSQL_PASS"],
+            database=os.environ["OS_MYSQL_DB"],
+        )
         with closing(con.cursor()) as cur:
-            sql = "SELECT id, name FROM images WHERE deleted = 0 AND " \
-                  "visibility = 'community'"
+            sql = (
+                "SELECT id, name FROM images WHERE deleted = 0 AND "
+                "visibility = 'community'"
+            )
             cur.execute(sql)
             for (id, name) in cur.fetchall():
-                self.log('Retrieved community image with id [{}] and name '
-                         '[{}] from database'.format(id, name))
+                self.log(
+                    "Retrieved community image with id [{}] and name "
+                    "[{}] from database".format(id, name)
+                )
                 db_img_list.append(id)
 
         return set(db_img_list)
@@ -134,7 +152,7 @@ class ImageSyncSlave:
 
         @returns processed (aka. parsed) images
         """
-        self.log('getting image list from slave')
+        self.log("getting image list from slave")
         processed_images_ids = set()
         to_delete_images_ids = set()
         existing_images = self.get_community_images_from_database()
@@ -143,10 +161,9 @@ class ImageSyncSlave:
         for image_helper in existing_images:
             image = self.glance_slave.images.get(image_helper)
             if len(image.id) < 2:
-                basename = '{0}.json'.format(image.id)
+                basename = "{0}.json".format(image.id)
             else:
-                basename = '{0}/{1}.json'.format(str(image.id)[:2],
-                                                 image.id)
+                basename = "{0}/{1}.json".format(str(image.id)[:2], image.id)
             filename = os.path.join(self.DATA_DIR, basename)
             if not os.path.isfile(filename):
                 to_delete_images_ids.add(image.id)
@@ -154,14 +171,16 @@ class ImageSyncSlave:
 
             metadata_local = self.read_metadata(filename)
             if not metadata_local:
-                self.log('ERROR: read_metadata did not retrieve anything '
-                         '({0})'.format(filename))
+                self.log(
+                    "ERROR: read_metadata did not retrieve anything "
+                    "({0})".format(filename)
+                )
                 continue
 
-            if metadata_local['checksum'] == image.checksum:
-                if not self.is_latest_metadata(metadata_local['id'],
-                                               metadata_local['updated_at'],
-                                               image.updated_at):
+            if metadata_local["checksum"] == image.checksum:
+                if not self.is_latest_metadata(
+                    metadata_local["id"], metadata_local["updated_at"], image.updated_at
+                ):
                     # checksum ok, metadata outdated
                     self.update_metadata(metadata_local, image)
                 processed_images_ids.add(image.id)
@@ -170,16 +189,17 @@ class ImageSyncSlave:
                 self.upload_to_slave(metadata_local)
                 processed_images_ids.add(image.id)
 
-        self.log('DEBUG: images pending to be deleted: '
-                 '{0}'.format(to_delete_images_ids))
+        self.log(
+            "DEBUG: images pending to be deleted: {0}".format(to_delete_images_ids)
+        )
         self.delete_images_from_slave(to_delete_images_ids)
-        self.log('DEBUG: processed images (to skip while parsing metadata '
-                 'files): {0}'.format(processed_images_ids))
+        self.log(
+            "DEBUG: processed images (to skip while parsing metadata "
+            "files): {0}".format(processed_images_ids)
+        )
         return processed_images_ids
 
-    def is_latest_metadata(self, image_id,
-                           master_updated_at,
-                           slave_updated_at):
+    def is_latest_metadata(self, image_id, master_updated_at, slave_updated_at):
         """Compares filename content (JSON metadata) and glance service info
         @return
             True: no need to update
@@ -189,70 +209,78 @@ class ImageSyncSlave:
         slave_dup = dateutil.parser.parse(slave_updated_at)
 
         if master_dup <= slave_dup:
-            self.log('INFO: is_latest_metadata :: {0} up to '
-                     'date'.format(image_id))
+            self.log("INFO: is_latest_metadata :: {0} up to date".format(image_id))
             return True
         else:
-            self.log('INFO: is_latest_metadata :: {0} outdated. Needs '
-                     'update_metadata.'.format(image_id))
+            self.log(
+                "INFO: is_latest_metadata :: {0} outdated. Needs "
+                "update_metadata.".format(image_id)
+            )
             return False
 
     def upload_to_slave(self, metadata_local):  # noqa: C901 is too complex (12)
         """upload image to glance slave service
         """
-        tmp_image_basename = '{0}.img'.format(metadata_local['id'])
+        tmp_image_basename = "{0}.img".format(metadata_local["id"])
         tmp_image = os.path.join(self.DATA_DIR, tmp_image_basename)
         try:
             clean_metadata, removed_props = self.mangle_metadata(metadata_local)
         except OSProjectNotFound as e:
-            self.log('EXCEPTION: upload_to_slave :: image-id {0} :: '
-                     'problem uploading data to glance '
-                     'slave (image could not be removed) :: '
-                     '{1}'.format(metadata_local['id'], e))
+            self.log(
+                "EXCEPTION: upload_to_slave :: image-id {0} :: "
+                "problem uploading data to glance "
+                "slave (image could not be removed) :: "
+                "{1}".format(metadata_local["id"], e)
+            )
             return False
 
         for k in removed_props:
             if k in clean_metadata:
                 del clean_metadata[k]
 
-        self.log('INFO: creating image {0}'.format(clean_metadata['id']))
+        self.log("INFO: creating image {0}".format(clean_metadata["id"]))
         try:
             self.glance_slave.images.create(**clean_metadata)
-            self.log('DEBUG: create image: {0}'.format(clean_metadata))
+            self.log("DEBUG: create image: {0}".format(clean_metadata))
         except Exception as e:  # TODO narrow this exception down
-            self.log('EXCEPTION: upload_to_slave :: {0}'.format(e))
+            self.log("EXCEPTION: upload_to_slave :: {0}".format(e))
             try:
                 # update metadata
-                self.glance_slave.images.update(clean_metadata['id'],
-                                                remove_props=removed_props,
-                                                **clean_metadata)
-                self.log('DEBUG: update_to_slave :: update metadata '
-                         '{0}'.format(clean_metadata))
+                self.glance_slave.images.update(
+                    clean_metadata["id"], remove_props=removed_props, **clean_metadata
+                )
+                self.log(
+                    "DEBUG: update_to_slave :: update metadata "
+                    "{0}".format(clean_metadata)
+                )
             except Exception as e:
                 if "HTTPNotFound" not in e:
-                    self.log('ERROR: update_to_slave (both image '
-                             'create/update failed :: {0} - this can '
-                             'happen if the image was deleted through '
-                             'the API but still exists in the glance '
-                             'database :: {1}'
-                             .format(clean_metadata['id'], e))
+                    self.log(
+                        "ERROR: update_to_slave (both image "
+                        "create/update failed :: {0} - this can "
+                        "happen if the image was deleted through "
+                        "the API but still exists in the glance "
+                        "database :: {1}".format(clean_metadata["id"], e)
+                    )
                     return False
 
-                self.log('ERROR: {0} {1} is likely deleted'.format(
-                    clean_metadata['id'], e))
+                self.log(
+                    "ERROR: {0} {1} is likely deleted".format(clean_metadata["id"], e)
+                )
 
         try:
             # Upload.
-            self.glance_slave.images.upload(clean_metadata['id'],
-                                            open(tmp_image, 'rb'))
+            self.glance_slave.images.upload(clean_metadata["id"], open(tmp_image, "rb"))
             os.remove(tmp_image)
-            self.log('DEBUG: update_to_slave :: upload {0}'.format(tmp_image))
+            self.log("DEBUG: update_to_slave :: upload {0}".format(tmp_image))
         except Exception as e:
             os.remove(tmp_image)
-            self.log('ERROR: upload_to_slave :: image-id {0} :: '
-                     'problem uploading data to glance '
-                     'slave (image could not be removed) :: '
-                     '{1}'.format(clean_metadata['id'], e))
+            self.log(
+                "ERROR: upload_to_slave :: image-id {0} :: "
+                "problem uploading data to glance "
+                "slave (image could not be removed) :: "
+                "{1}".format(clean_metadata["id"], e)
+            )
             return False
 
     def download_from_master(self, metadata_local):  # noqa: C901 is too complex (12)
@@ -261,45 +289,54 @@ class ImageSyncSlave:
         @return True: downloaded or already on local storage
         @return False: error
         """
-        tmp_image_basename = '{0}.img'.format(metadata_local['id'])
+        tmp_image_basename = "{0}.img".format(metadata_local["id"])
         tmp_image = os.path.join(self.DATA_DIR, tmp_image_basename)
         if os.path.isfile(tmp_image):
-            if self.check_md5(metadata_local['checksum'], tmp_image):
+            if self.check_md5(metadata_local["checksum"], tmp_image):
                 return True
 
             try:
                 os.remove(tmp_image)
             except Exception as e:
-                self.log('ERROR: download_from_master :: {0}'.format(e))
+                self.log("ERROR: download_from_master :: {0}".format(e))
                 return False
         downloaded = False
         retries = 3
         for i in range(0, retries):
             try:
                 bin_image = self.glance_master.images.data(
-                    image_id=metadata_local['id'])
+                    image_id=metadata_local["id"]
+                )
 
                 hash_md5 = hashlib.md5()
-                with open(tmp_image, 'wb') as fd:
+                with open(tmp_image, "wb") as fd:
                     for chunk in bin_image:
                         fd.write(chunk)
                         hash_md5.update(chunk)
                 bin_image_checksum = hash_md5.hexdigest()
-                if metadata_local['checksum'] == bin_image_checksum:
+                if metadata_local["checksum"] == bin_image_checksum:
                     downloaded = True
-                    self.log('INFO: download_from_master ({0} - {1}):: '
-                             'checksum OK'.format(metadata_local['id'],
-                                                  metadata_local['checksum']))
+                    self.log(
+                        "INFO: download_from_master ({0} - {1}):: "
+                        "checksum OK".format(
+                            metadata_local["id"], metadata_local["checksum"]
+                        )
+                    )
                     break
                 elif os.path.exists(tmp_image):
-                    self.log('INFO: download_from_master ({0}/{1}; {2}):: '
-                             'invalid checksum '
-                             '{3}'.format(metadata_local['id'], i, retries,
-                                          bin_image_checksum))
+                    self.log(
+                        "INFO: download_from_master ({0}/{1}; {2}):: "
+                        "invalid checksum "
+                        "{3}".format(
+                            metadata_local["id"], i, retries, bin_image_checksum
+                        )
+                    )
                     os.remove(tmp_image)
             except Exception as e:
-                self.log('EXCEPTION: download_from_master ({0}/{1}; {2}):: '
-                         '{3}'.format(i, retries, metadata_local['id'], e))
+                self.log(
+                    "EXCEPTION: download_from_master ({0}/{1}; {2}):: "
+                    "{3}".format(i, retries, metadata_local["id"], e)
+                )
                 if os.path.exists(tmp_image):
                     os.remove(tmp_image)
 
@@ -310,86 +347,90 @@ class ImageSyncSlave:
         deletes images not found in local storage
         """
         if not to_delete_images_ids:
-            self.log('WARNING: precautionary halt. No glance images found '
-                     'to be deleted. noop.')
+            self.log(
+                "WARNING: precautionary halt. No glance images found "
+                "to be deleted. noop."
+            )
             return
 
         for image_id in to_delete_images_ids:
-            self.log('INFO: removing image {0}'.format(image_id))
+            self.log("INFO: removing image {0}".format(image_id))
             try:
                 self.glance_slave.images.delete(image_id)
-                self.log('DEBUG: image {0} removed'.format(image_id))
+                self.log("DEBUG: image {0} removed".format(image_id))
             except Exception as e:  # TODO narrow the exception down
-                self.log('ERROR: could not delete {0} :: '
-                         '{1}'.format(image_id, e))
+                self.log("ERROR: could not delete {0} :: {1}".format(image_id, e))
 
     def create_missing_slave_images(self, processed_images_ids):
 
         for dirpath, dirnames, filenames in os.walk(self.DATA_DIR):
-            if dirpath != self.DATA_DIR and \
-               len(dirnames) == 0 and \
-               len(filenames) == 0:
+            if dirpath != self.DATA_DIR and len(dirnames) == 0 and len(filenames) == 0:
                 os.rmdir(dirpath)
                 continue
 
             for filename in filenames:
                 full_path = os.path.join(dirpath, filename)
-                if filename.endswith('.json'):
+                if filename.endswith(".json"):
                     image_id = filename[:-5]
                     if image_id in processed_images_ids:
                         continue
 
                     metadata_local = self.read_metadata(full_path)
                     if not metadata_local:
-                        self.log('ERROR: read_metadata did not '
-                                 'retrieve anything '
-                                 '({0})'.format(full_path))
+                        self.log(
+                            "ERROR: read_metadata did not "
+                            "retrieve anything "
+                            "({0})".format(full_path)
+                        )
                         continue
 
                     slave_project_id = self.project_mapping(metadata_local)
                     if not slave_project_id:
-                        self.log('DEBUG: could not map image into any '
-                                 'slave project :: {0}'.format(metadata_local))
+                        self.log(
+                            "DEBUG: could not map image into any "
+                            "slave project :: {0}".format(metadata_local)
+                        )
                         continue
 
-                    metadata_local['owner'] = slave_project_id
+                    metadata_local["owner"] = slave_project_id
                     if self.download_from_master(metadata_local):
                         self.upload_to_slave(metadata_local)
                     else:
-                        self.log('ERROR: image {0} could not be downloaded '
-                                 'from master'.format(metadata_local['id']))
+                        self.log(
+                            "ERROR: image {0} could not be downloaded "
+                            "from master".format(metadata_local["id"])
+                        )
 
     def project_mapping(self, metadata_local):
         """can master/slave projects be mapped, no matter project_ids are not
         the same?
         """
         # master/slave match can't be done (no project_id)
-        if 'owner' not in metadata_local:
+        if "owner" not in metadata_local:
             return False
 
         # master/slave project_ids match
-        if metadata_local['owner'] in self.projects_slave:
-            return metadata_local['owner']
+        if metadata_local["owner"] in self.projects_slave:
+            return metadata_local["owner"]
 
         # no extra project_name passed -- can't check match
-        if 'bs_owner' not in metadata_local:
+        if "bs_owner" not in metadata_local:
             return False
 
-        master_project_name = metadata_local['bs_owner']
+        master_project_name = metadata_local["bs_owner"]
 
         # XXX(aluria): no image on slave service
         # XXX(aluria): look for similar project on slave
-        for slave_project_id, slave_project_name in (
-                self.projects_slave.items()):
-            slave_to_master = slave_project_name.replace(self.REGION_SLAVE,
-                                                         self.REGION_MASTER)
+        for slave_project_id, slave_project_name in self.projects_slave.items():
+            slave_to_master = slave_project_name.replace(
+                self.REGION_SLAVE, self.REGION_MASTER
+            )
             # XXX(aluria): pitfall, if on master service there are
             # XXX(aluria): 2 projects:
             # XXX(auria):   REGION_SLAVE-restofprojectname
             # XXX(auria):   REGION_MASTER-restofprojectname
             # XXX(auria): first found gets image assigned
-            if master_project_name in (slave_project_name,
-                                       slave_to_master):
+            if master_project_name in (slave_project_name, slave_to_master):
                 return slave_project_id
         return False
 
@@ -413,49 +454,47 @@ class ImageSyncSlave:
                     data = json.load(meta_file)
                     return data
                 except Exception as e:
-                    self.log('EXCEPTION: {0}'.format(e))
+                    self.log("EXCEPTION: {0}".format(e))
                     return False
         else:
-            self.log('INFO: {0} not found.'.format(metadata_file))
+            self.log("INFO: {0} not found.".format(metadata_file))
             return False
 
     def glance_connect_slave(self):
         try:
             self.keystone = os_client_config.session_client(
-                'identity',
-                cloud='envvars',
-            )
-            self.glance_slave = os_client_config.make_client(
-                'image',
-                cloud='envvars',
+                "identity", cloud="envvars",
             )
+            self.glance_slave = os_client_config.make_client("image", cloud="envvars")
         except Exception as e:
-            self.log('EXCEPTION: {0}'.format(e))
-            self.log('ERROR: unable to load environment variables, please '
-                     'source novarc')
+            self.log("EXCEPTION: {0}".format(e))
+            self.log(
+                "ERROR: unable to load environment variables, please source novarc"
+            )
             self.release_lock()
             sys.exit(2)
         if not self.projects_slave:
             self.projects_slave = dict(
-                [(tenant['id'], tenant['name'])
-                 for tenant in self.keystone.get('/projects').json()['projects']
-                 if tenant['enabled']]
+                [
+                    (tenant["id"], tenant["name"])
+                    for tenant in self.keystone.get("/projects").json()["projects"]
+                    if tenant["enabled"]
+                ]
             )
-        self.REGION_SLAVE = os.environ['OS_REGION_NAME'].upper()
+        self.REGION_SLAVE = os.environ["OS_REGION_NAME"].upper()
         return self.glance_slave
 
     def glance_connect_master(self):
         try:
-            self.glance_master = os_client_config.make_client(
-                'image',
-                cloud='master',
-            )
-            self.REGION_MASTER = os.environ['OS_MASTER_REGION']
+            self.glance_master = os_client_config.make_client("image", cloud="master")
+            self.REGION_MASTER = os.environ["OS_MASTER_REGION"]
         except Exception as e:
-            self.log('EXCEPTION: {0}'.format(e))
-            self.log('ERROR: unable to load master cloud environment, '
-                     'please check master_creds settings and '
-                     '/etc/openstack/clouds.yaml')
+            self.log("EXCEPTION: {0}".format(e))
+            self.log(
+                "ERROR: unable to load master cloud environment, "
+                "please check master_creds settings and "
+                "/etc/openstack/clouds.yaml"
+            )
             self.release_lock()
             sys.exit(2)
         return self.glance_master
@@ -464,7 +503,7 @@ class ImageSyncSlave:
         return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
     def log(self, msg):
-        print('{0} {1}'.format(self.timestamp_now(), msg))
+        print("{0} {1}".format(self.timestamp_now(), msg))
 
     def mangle_metadata(self, metadata_local, metadata_slave=None):
         """Maps projects in MASTER region with projects in SLAVE region
@@ -519,122 +558,132 @@ class ImageSyncSlave:
          'base_image_ref',
          'owner_id']
         """
-        if 'owner' not in metadata_local:
-            raise (OSProjectNotFound, 'no owner :: {0}'.format(metadata_local))
+        if "owner" not in metadata_local:
+            raise (OSProjectNotFound, "no owner :: {0}".format(metadata_local))
 
-        if metadata_local['owner'] not in self.projects_slave:
-            if 'bs_owner' in metadata_local:
-                master_project_name = metadata_local['bs_owner']
+        if metadata_local["owner"] not in self.projects_slave:
+            if "bs_owner" in metadata_local:
+                master_project_name = metadata_local["bs_owner"]
             else:
-                raise (OSProjectNotFound, 'no bs_owner :: '
-                       '{0}'.format(metadata_local))
+                raise (
+                    OSProjectNotFound,
+                    "no bs_owner :: {0}".format(metadata_local),
+                )
 
             # XXX(aluria): image does not exist on slave service
             if not metadata_slave:
                 slave_project_id = self.project_mapping(metadata_local)
                 if not slave_project_id:
-                    raise (OSProjectNotFound, 'no project_mapping :: '
-                           '{0}'.format(metadata_local))
-                elif metadata_local['owner'] != slave_project_id:
-                    metadata_local['owner'] = slave_project_id
+                    raise (
+                        OSProjectNotFound,
+                        "no project_mapping :: {0}".format(metadata_local),
+                    )
+                elif metadata_local["owner"] != slave_project_id:
+                    metadata_local["owner"] = slave_project_id
             # XXX(aluria): image exists on slave service
             # XXX(aluria): keep all metadata and mangle project_id (owner)
             else:
                 # ie. admin, services, SLAVE-CENTRAL
-                slave_project_name = self.projects_slave[metadata_slave['owner']]
+                slave_project_name = self.projects_slave[metadata_slave["owner"]]
                 # ie. admin, services, MASTER-CENTRAL
-                slave_to_master = \
-                    slave_project_name.replace(self.REGION_SLAVE,
-                                               self.REGION_MASTER)
+                slave_to_master = slave_project_name.replace(
+                    self.REGION_SLAVE, self.REGION_MASTER
+                )
                 # ie. admin, services, MASTER-CENTRAL
-                if master_project_name in (slave_project_name,
-                                           slave_to_master):
-                    metadata_local['owner'] = metadata_slave['owner']
+                if master_project_name in (slave_project_name, slave_to_master):
+                    metadata_local["owner"] = metadata_slave["owner"]
                 else:
-                    raise (OSProjectNotFound, 'project not found: '
-                           '{0}'.format(metadata_local))
+                    raise (
+                        OSProjectNotFound,
+                        "project not found: {0}".format(metadata_local),
+                    )
 
-        removed_props = [k for k in metadata_local.keys() if k not in
-                         self.valid_properties]
+        removed_props = [
+            k for k in metadata_local.keys() if k not in self.valid_properties
+        ]
         return (metadata_local, removed_props)
 
     def update_metadata(self, metadata_local, metadata_slave):
-        self.log('INFO: image-id {0}: updating '
-                 'metadata'.format(metadata_local['id']))
+        self.log("INFO: image-id {0}: updating metadata".format(metadata_local["id"]))
 
-        metadata, removed_props = self.mangle_metadata(metadata_local,
-                                                       metadata_slave)
+        metadata, removed_props = self.mangle_metadata(metadata_local, metadata_slave)
         for k in removed_props:
             if k in metadata:
                 del metadata[k]
 
         try:
-            self.glance_slave.images.update(metadata['id'],
-                                            **metadata)
+            self.glance_slave.images.update(metadata["id"], **metadata)
         except Exception as e:
-            self.log('EXCEPTION: update_metadata :: {0} - '
-                     '{1}'.format(metadata['id'], e))
+            self.log(
+                "EXCEPTION: update_metadata :: {0} - {1}".format(metadata["id"], e)
+            )
             raise e
 
     def create_lock(self, lockfile):
         try:
-            with open(lockfile, 'w') as lock:
+            with open(lockfile, "w") as lock:
                 lock.write(str(os.getpid()))
         except OSError:
-            self.log('ERROR: could not create lockfile {0}'.format(lockfile))
+            self.log("ERROR: could not create lockfile {0}".format(lockfile))
 
-    def file_locked(self, lockfile='/tmp/glance_sync_slave.lock'):
+    def file_locked(self, lockfile="/tmp/glance_sync_slave.lock"):
         if os.path.isfile(lockfile):
             return True
         else:
             return False
 
-    def release_lock(self, lockfile='/tmp/glance_sync_slave.lock'):
+    def release_lock(self, lockfile="/tmp/glance_sync_slave.lock"):
         if os.path.isfile(lockfile):
             try:
                 os.remove(lockfile)
             except OSError as e:
                 self.log(e)
 
-    def set_filelock(self, lockfile='/tmp/glance_sync_slave.lock'):
+    def set_filelock(self, lockfile="/tmp/glance_sync_slave.lock"):
         if self.file_locked(lockfile):
-            self.log('WARNING: sync already in progress, exiting')
+            self.log("WARNING: sync already in progress, exiting")
             sys.exit(2)
 
         self.create_lock(lockfile)
         atexit.register(self.release_lock)
 
     def main(self):
-        self.log('starting glance sync')
-        self.log('getting metadata from master')
+        self.log("starting glance sync")
+        self.log("getting metadata from master")
         self.download_metadata_from_master()
         processed_images_ids = self.parse_glance_slave_images()
         self.create_missing_slave_images(processed_images_ids)
-        self.log('ending glance image sync slave run')
+        self.log("ending glance image sync slave run")
         self.release_lock()
 
 
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Synchronize remote images '
-                                     'metadata to disk and import into glance')
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Synchronize remote images "
+        "metadata to disk and import into glance"
+    )
     parser.add_argument("-d", "--datadir", help="directory to write images to")
-    parser.add_argument("-s", "--source", help="full path to master rsync "
-                                               "source. Format: "
-                                               "<user>@<hostname>:<port>/"
-                                               "<directory>")
+    parser.add_argument(
+        "-s",
+        "--source",
+        help="full path to master rsync "
+        "source. Format: "
+        "<user>@<hostname>:<port>/"
+        "<directory>",
+    )
     args = parser.parse_args()
 
     if args.datadir:
         data_dir = args.datadir
     else:
         parser.print_help()
-        sys.exit('ERROR: please specify an output directory for images')
+        sys.exit("ERROR: please specify an output directory for images")
 
     if args.source:
         source = args.source
     else:
         parser.print_help()
-        sys.exit('ERROR: please specify an image source to sync from')
+        sys.exit("ERROR: please specify an image source to sync from")
 
     slave = ImageSyncSlave(data_dir, source)
     slave.main()
diff --git a/src/reactive/glance_sync.py b/src/reactive/glance_sync.py
index bd80f43..dff83c6 100644
--- a/src/reactive/glance_sync.py
+++ b/src/reactive/glance_sync.py
@@ -15,59 +15,53 @@ from charmhelpers.contrib.openstack.utils import config_flags_parser
 from charms.reactive import hook, clear_flag, when, when_any
 
 
-@hook('install')
+@hook("install")
 def install_glance_sync():
     """Install glance-sync charm."""
-    hookenv.status_set('maintenance', 'Installing')
+    hookenv.status_set("maintenance", "Installing")
     configure_config_dir()
     configure_log_dir()
     configure_script_dir()
     configure_sync_mode()
 
-    homedir = os.path.expanduser('~ubuntu')
-    ssh_identity = '{}/.ssh/id_rsa'.format(homedir)
+    homedir = os.path.expanduser("~ubuntu")
+    ssh_identity = "{}/.ssh/id_rsa".format(homedir)
     if not os.path.exists(ssh_identity):
-        command = ['ssh-keygen', '-t', 'rsa', '-N', '',
-                   '-f', ssh_identity]
-        proc = subprocess.Popen(command,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.PIPE)
+        command = ["ssh-keygen", "-t", "rsa", "-N", "", "-f", ssh_identity]
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (stdout, stderr) = proc.communicate()
         if proc.returncode:
-            print("ERROR: problem generating ssh key '{}':"
-                  .format(command))
+            print("ERROR: problem generating ssh key '{}':".format(command))
             print(stderr)
-        os.chown(ssh_identity,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(
+            ssh_identity, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid
+        )
 
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.master_mode')
+@when("config.changed.master_mode")
 def configure_sync_mode():
     """Configure glance-sync charm to be either master or slave."""
-    master_enabled = hookenv.config('master_mode')
-    hookenv.log('configuring mode')
+    master_enabled = hookenv.config("master_mode")
+    hookenv.log("configuring mode")
     if master_enabled:
-        hookenv.status_set('maintenance',
-                           'Configuring master')
-        hookenv.log('configuring unit as master')
+        hookenv.status_set("maintenance", "Configuring master")
+        hookenv.log("configuring unit as master")
         perform_slave_cleanup()
         install_master_sync_script()
-        hookenv.log('opening TCP port 22')
-        open_port(22, protocol='TCP')
+        hookenv.log("opening TCP port 22")
+        open_port(22, protocol="TCP")
     else:
-        hookenv.status_set('maintenance',
-                           'Configuring slave')
-        hookenv.log('configuring unit as slave')
+        hookenv.status_set("maintenance", "Configuring slave")
+        hookenv.log("configuring unit as slave")
         perform_master_cleanup()
         install_slave_sync_script()
 
     install_db_cleanup_script()
     configure_cron()
     configure_data_dir()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
 def perform_slave_cleanup():
@@ -75,29 +69,29 @@ def perform_slave_cleanup():
     Cleanup glance-sync slave files, once the charm is set
     to be the master, after being a slave.
     """
-    data_dir = hookenv.config('data_dir')
+    data_dir = hookenv.config("data_dir")
     if os.path.exists(data_dir):
         shutil.rmtree(data_dir, ignore_errors=True)
 
-    script_dir = hookenv.config('script_dir')
+    script_dir = hookenv.config("script_dir")
     if os.path.exists(script_dir):
         shutil.rmtree(script_dir, ignore_errors=True)
 
-    config_dir = hookenv.config('config_dir')
-    novarc_file = os.path.join(config_dir, 'novarc')
+    config_dir = hookenv.config("config_dir")
+    novarc_file = os.path.join(config_dir, "novarc")
     if os.path.isfile(novarc_file):
         os.remove(novarc_file)
 
-    clouds_yaml_dir = '/etc/openstack'
+    clouds_yaml_dir = "/etc/openstack"
     if os.path.exists(clouds_yaml_dir):
         shutil.rmtree(clouds_yaml_dir, ignore_errors=True)
 
-    cron_file = '/etc/cron.d/glance_sync_slave'
+    cron_file = "/etc/cron.d/glance_sync_slave"
     if os.path.isfile(cron_file):
         os.remove(cron_file)
-        clear_flag('cron.configured')
+        clear_flag("cron.configured")
 
-    clear_flag('slave.configured')
+    clear_flag("slave.configured")
 
 
 def perform_master_cleanup():
@@ -105,168 +99,162 @@ def perform_master_cleanup():
     Cleanup glance-sync master files, once the charm is set
     to be a slave, after being the master.
     """
-    data_dir = hookenv.config('data_dir')
+    data_dir = hookenv.config("data_dir")
     if os.path.exists(data_dir):
         shutil.rmtree(data_dir, ignore_errors=True)
 
-    script_dir = hookenv.config('script_dir')
+    script_dir = hookenv.config("script_dir")
     if os.path.exists(script_dir):
         shutil.rmtree(script_dir, ignore_errors=True)
 
-    config_dir = hookenv.config('config_dir')
-    novarc_file = os.path.join(config_dir, 'novarc')
+    config_dir = hookenv.config("config_dir")
+    novarc_file = os.path.join(config_dir, "novarc")
     if os.path.isfile(novarc_file):
         os.remove(novarc_file)
 
-    cron_file = '/etc/cron.d/glance_sync_master'
+    cron_file = "/etc/cron.d/glance_sync_master"
     if os.path.isfile(cron_file):
         os.remove(cron_file)
-        clear_flag('cron.configured')
+        clear_flag("cron.configured")
 
-    clear_flag('master.configured')
+    clear_flag("master.configured")
 
 
-@hook('upgrade-charm')
+@hook("upgrade-charm")
 def upgrade_glance_sync():
     """Perform charm upgrade."""
     install_glance_sync()
 
 
-@when('config.changed.config_dir')
+@when("config.changed.config_dir")
 def configure_config_dir():
     """Configure 'config_dir' directory, and configure cron."""
-    hookenv.status_set('maintenance', 'Configuring')
-    config_dir = hookenv.config('config_dir')
+    hookenv.status_set("maintenance", "Configuring")
+    config_dir = hookenv.config("config_dir")
     if not os.path.exists(config_dir):
         os.makedirs(config_dir)
-        os.chown(config_dir,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(
+            config_dir, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid
+        )
 
     configure_cron()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.data_dir')
+@when("config.changed.data_dir")
 def configure_data_dir():
     """Configure 'data_dir' directory, and configure cron."""
-    hookenv.status_set('maintenance', 'Configuring')
-    data_dir = hookenv.config('data_dir')
+    hookenv.status_set("maintenance", "Configuring")
+    data_dir = hookenv.config("data_dir")
     if not os.path.exists(data_dir):
         os.makedirs(data_dir)
-        os.chown(data_dir,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(data_dir, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
 
     configure_cron()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.log_dir')
+@when("config.changed.log_dir")
 def configure_log_dir():
     """
     Configure 'log_dir' directory, setup lograte for glance-sync
     log files, and configure cron.
     """
-    hookenv.status_set('maintenance', 'Configuring')
-    log_dir = hookenv.config('log_dir')
+    hookenv.status_set("maintenance", "Configuring")
+    log_dir = hookenv.config("log_dir")
     if not os.path.exists(log_dir):
         os.makedirs(log_dir)
-        os.chown(log_dir,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(log_dir, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
     templating.render(
-        source='logrotate.d.j2',
-        target='/etc/logrotate.d/glance_sync',
-        owner='root',
-        group='root',
+        source="logrotate.d.j2",
+        target="/etc/logrotate.d/glance_sync",
+        owner="root",
+        group="root",
         perms=0o644,
         context=hookenv.config(),
     )
 
     configure_cron()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.script_dir')
+@when("config.changed.script_dir")
 def configure_script_dir():
     """Configure 'script_dir' directory, and configure cron."""
-    hookenv.status_set('maintenance', 'Configuring')
-    script_dir = hookenv.config('script_dir')
+    hookenv.status_set("maintenance", "Configuring")
+    script_dir = hookenv.config("script_dir")
     if not os.path.exists(script_dir):
         os.makedirs(script_dir)
-        os.chown(script_dir,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(
+            script_dir, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid
+        )
 
     configure_cron()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.authorized_keys')
+@when("config.changed.authorized_keys")
 def configure_authorized_keys():
     """
     Configure authorized_keys file containing command-limited
     public keys for slave(s).
     """
-    hookenv.status_set('maintenance', 'Configuring')
-    ssh_conf_dir = '/etc/ssh/authorized-keys'
-    auth_keys_file = os.path.join(ssh_conf_dir,
-                                  'glance-sync-slaves')
-    authorized_keys = hookenv.config('authorized_keys')
+    hookenv.status_set("maintenance", "Configuring")
+    ssh_conf_dir = "/etc/ssh/authorized-keys"
+    auth_keys_file = os.path.join(ssh_conf_dir, "glance-sync-slaves")
+    authorized_keys = hookenv.config("authorized_keys")
     if authorized_keys:
         keys_bytestring = base64.b64decode(authorized_keys)
-        keys = str(keys_bytestring, 'utf-8')
+        keys = str(keys_bytestring, "utf-8")
         if not os.path.exists(ssh_conf_dir):
             os.makedirs(ssh_conf_dir)
-            os.chown(ssh_conf_dir,
-                     pwd.getpwnam('root').pw_uid,
-                     grp.getgrnam('root').gr_gid)
+            os.chown(
+                ssh_conf_dir, pwd.getpwnam("root").pw_uid, grp.getgrnam("root").gr_gid
+            )
             os.chmod(ssh_conf_dir, 0o755)
-        with open(auth_keys_file, 'w') as f:
+        with open(auth_keys_file, "w") as f:
             f.write(keys)
         os.chmod(auth_keys_file, 0o644)
         configure_sshd(auth_keys_file)
-        hookenv.status_set('active', 'Unit is ready')
+        hookenv.status_set("active", "Unit is ready")
     else:
         if os.path.isfile(auth_keys_file):
             os.remove(auth_keys_file)
-        hookenv.status_set('active', 'Unit is ready')
+        hookenv.status_set("active", "Unit is ready")
 
 
 def configure_sshd(keys_file):
     """Add 'AuthorizedKeysFile' line to '/etc/ssh/sshd_config'."""
-    original = '/etc/ssh/sshd_config'
-    temp_config = '/tmp/sshd_config'
+    original = "/etc/ssh/sshd_config"
+    temp_config = "/tmp/sshd_config"
     old_lines = []
     auth_keys_file_added = False
     auth_keys_file_existed = False
-    homedirs = '%h/.ssh/authorized_keys'
-    with open(original, 'r') as old_file:
+    homedirs = "%h/.ssh/authorized_keys"
+    with open(original, "r") as old_file:
         for line in old_file:
             old_lines.append(line)
-    with open(temp_config, 'w') as new_file:
+    with open(temp_config, "w") as new_file:
         for line in old_lines:
-            if re.search(r'^AuthorizedKeysFile.*{}.*'
-                         .format(keys_file), line):
+            if re.search(r"^AuthorizedKeysFile.*{}.*".format(keys_file), line):
                 auth_keys_file_existed = True
                 new_file.write(line)
                 continue
             else:
-                replaced = re.sub(r'^AuthorizedKeysFile\s(.*)$',
-                                  r'AuthorizedKeysFile \1 {} {}'
-                                  .format(homedirs, keys_file),
-                                  line)
+                replaced = re.sub(
+                    r"^AuthorizedKeysFile\s(.*)$",
+                    r"AuthorizedKeysFile \1 {} {}".format(homedirs, keys_file),
+                    line,
+                )
                 if replaced is not line:
                     auth_keys_file_added = True
                 new_file.write(replaced)
 
         if not auth_keys_file_existed and not auth_keys_file_added:
-            new_file.write('AuthorizedKeysFile {} {}\n'
-                           .format(homedirs, keys_file))
+            new_file.write("AuthorizedKeysFile {} {}\n".format(homedirs, keys_file))
 
     shutil.copy(temp_config, original)
-    os.system('sudo sshd -t && sudo service ssh reload')
+    os.system("sudo sshd -t && sudo service ssh reload")
 
 
 def install_slave_sync_script():
@@ -274,22 +262,19 @@ def install_slave_sync_script():
     Install slave files, and corresponding directory
     structure.
     """
-    hookenv.status_set('maintenance', 'Installing')
-    hookenv.log('installing slave sync script')
-    script_dir = hookenv.config('script_dir')
-    files = ['glance_sync_slave.py']
+    hookenv.status_set("maintenance", "Installing")
+    hookenv.log("installing slave sync script")
+    script_dir = hookenv.config("script_dir")
+    files = ["glance_sync_slave.py"]
     for file in files:
-        source = os.path.join(hookenv.charm_dir(),
-                              'files', file)
+        source = os.path.join(hookenv.charm_dir(), "files", file)
         dest = os.path.join(script_dir, file)
         if not os.path.exists(os.path.dirname(dest)):
             os.makedirs(os.path.dirname(dest))
         shutil.copy(source, dest)
-        os.chown(dest,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(dest, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
         os.chmod(dest, 0o750)
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
 def install_master_sync_script():
@@ -297,22 +282,19 @@ def install_master_sync_script():
     Install master files, and corresponding directory
     structure.
     """
-    hookenv.status_set('maintenance', 'Installing')
-    hookenv.log('installing master sync script')
-    script_dir = hookenv.config('script_dir')
-    files = ['glance_sync_master.py']
+    hookenv.status_set("maintenance", "Installing")
+    hookenv.log("installing master sync script")
+    script_dir = hookenv.config("script_dir")
+    files = ["glance_sync_master.py"]
     for file in files:
-        source = os.path.join(hookenv.charm_dir(),
-                              'files', file)
+        source = os.path.join(hookenv.charm_dir(), "files", file)
         dest = os.path.join(script_dir, file)
         if not os.path.exists(os.path.dirname(dest)):
             os.makedirs(os.path.dirname(dest))
         shutil.copy(source, dest)
-        os.chown(dest,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(dest, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
         os.chmod(dest, 0o750)
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
 def install_db_cleanup_script():
@@ -320,102 +302,102 @@ def install_db_cleanup_script():
     Install 'db_purge_deleted_glance_images.py' for
     master or slave.
     """
-    hookenv.status_set('maintenance', 'Installing')
-    script_dir = hookenv.config('script_dir')
-    master_enabled = hookenv.config('master_mode')
+    hookenv.status_set("maintenance", "Installing")
+    script_dir = hookenv.config("script_dir")
+    master_enabled = hookenv.config("master_mode")
     if master_enabled:
-        mode = 'master'
+        mode = "master"
     else:
-        mode = 'slave'
-    source = os.path.join(hookenv.charm_dir(), 'files',
-                          'db_purge_deleted_' + mode,
-                          'db_purge_deleted_glance_images.py')
-    dest = os.path.join(script_dir,
-                        'db_purge_deleted_glance_images.py')
+        mode = "slave"
+    source = os.path.join(
+        hookenv.charm_dir(),
+        "files",
+        "db_purge_deleted_" + mode,
+        "db_purge_deleted_glance_images.py",
+    )
+    dest = os.path.join(script_dir, "db_purge_deleted_glance_images.py")
     shutil.copy(source, dest)
-    os.chown(dest,
-             pwd.getpwnam('ubuntu').pw_uid,
-             grp.getgrnam('ubuntu').gr_gid)
+    os.chown(dest, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
     os.chmod(dest, 0o750)
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.master_creds')
+@when("config.changed.master_creds")
 def configure_master_novarc():
     """
     Get context from 'master_creds'. Put the info into 'clouds.yaml'
     for the openstacksdk.
     """
-    keystone_creds = config_flags_parser(hookenv.config('master_creds'))
-    clouds_yaml_dir = '/etc/openstack'
+    keystone_creds = config_flags_parser(hookenv.config("master_creds"))
+    clouds_yaml_dir = "/etc/openstack"
     if not keystone_creds:
-        hookenv.status_set('blocked', 'Please add master_creds')
+        hookenv.status_set("blocked", "Please add master_creds")
         return
     elif not os.path.exists(clouds_yaml_dir):
         creds = {}
-        keystone_creds = config_flags_parser(hookenv.config('master_creds'))
-        if '/v3' in keystone_creds['auth_url']:
+        keystone_creds = config_flags_parser(hookenv.config("master_creds"))
+        if "/v3" in keystone_creds["auth_url"]:
             creds = {
-                'master_username': keystone_creds['username'],
-                'master_password': keystone_creds['password'],
-                'master_project': keystone_creds['project'],
-                'master_region': keystone_creds['region'],
-                'master_auth_url': keystone_creds['auth_url'],
-                'master_auth_version': '3',
-                'master_user_domain': keystone_creds['domain'],
-                'master_project_domain': keystone_creds['domain'],
+                "master_username": keystone_creds["username"],
+                "master_password": keystone_creds["password"],
+                "master_project": keystone_creds["project"],
+                "master_region": keystone_creds["region"],
+                "master_auth_url": keystone_creds["auth_url"],
+                "master_auth_version": "3",
+                "master_user_domain": keystone_creds["domain"],
+                "master_project_domain": keystone_creds["domain"],
             }
         else:
             creds = {
-                'master_username': keystone_creds['username'],
-                'master_password': keystone_creds['password'],
-                'master_project': keystone_creds['project'],
-                'master_region': keystone_creds['region'],
-                'master_auth_url': keystone_creds['auth_url'],
+                "master_username": keystone_creds["username"],
+                "master_password": keystone_creds["password"],
+                "master_project": keystone_creds["project"],
+                "master_region": keystone_creds["region"],
+                "master_auth_url": keystone_creds["auth_url"],
             }
     elif os.path.exists(clouds_yaml_dir):
         shutil.rmtree(clouds_yaml_dir, ignore_errors=True)
         creds = {}
-        keystone_creds = config_flags_parser(hookenv.config('master_creds'))
-        if '/v3' in keystone_creds['auth_url']:
+        keystone_creds = config_flags_parser(hookenv.config("master_creds"))
+        if "/v3" in keystone_creds["auth_url"]:
             creds = {
-                'master_username': keystone_creds['username'],
-                'master_password': keystone_creds['password'],
-                'master_project': keystone_creds['project'],
-                'master_region': keystone_creds['region'],
-                'master_auth_url': keystone_creds['auth_url'],
-                'master_auth_version': '3',
-                'master_user_domain': keystone_creds['domain'],
-                'master_project_domain': keystone_creds['domain'],
+                "master_username": keystone_creds["username"],
+                "master_password": keystone_creds["password"],
+                "master_project": keystone_creds["project"],
+                "master_region": keystone_creds["region"],
+                "master_auth_url": keystone_creds["auth_url"],
+                "master_auth_version": "3",
+                "master_user_domain": keystone_creds["domain"],
+                "master_project_domain": keystone_creds["domain"],
             }
         else:
             creds = {
-                'master_username': keystone_creds['username'],
-                'master_password': keystone_creds['password'],
-                'master_project': keystone_creds['project'],
-                'master_region': keystone_creds['region'],
-                'master_auth_url': keystone_creds['auth_url'],
+                "master_username": keystone_creds["username"],
+                "master_password": keystone_creds["password"],
+                "master_project": keystone_creds["project"],
+                "master_region": keystone_creds["region"],
+                "master_auth_url": keystone_creds["auth_url"],
             }
-    clouds_yaml = os.path.join(clouds_yaml_dir, 'clouds.yaml')
+    clouds_yaml = os.path.join(clouds_yaml_dir, "clouds.yaml")
     templating.render(
-        source='clouds.yaml.j2',
+        source="clouds.yaml.j2",
         target=clouds_yaml,
-        owner='ubuntu',
-        group='ubuntu',
+        owner="ubuntu",
+        group="ubuntu",
         perms=0o600,
         context=creds,
     )
     configure_novarc()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.novarc')
+@when("config.changed.novarc")
 def configure_custom_novarc():
     """Configure 'novarc' file after config change."""
     configure_novarc()
 
 
-@hook('keystone-admin-relation-{joined,changed}')
+@hook("keystone-admin-relation-{joined,changed}")
 def configure_relation_novarc(relation=None):
     """
     Configure 'novarc' file after adding keystone
@@ -424,7 +406,7 @@ def configure_relation_novarc(relation=None):
     configure_novarc()
 
 
-@hook('database-relation-{joined,changed}')
+@hook("database-relation-{joined,changed}")
 def configure_relation_glancedb(relation=None):
     """
     Configure 'novarc' file after adding database
@@ -438,94 +420,88 @@ def configure_novarc():
     Configure 'novarc' file from user supplied custom novarc
     file, or using keystone and mysql relations.
     """
-    hookenv.status_set('maintenance', 'Configuring')
-    keystone_relations = hookenv.relations_of_type('keystone-admin')
-    db_relations = hookenv.relations_of_type('database')
-    config_dir = hookenv.config('config_dir')
-    novarc_file = os.path.join(config_dir, 'novarc')
-    custom_novarc = hookenv.config('novarc')
+    hookenv.status_set("maintenance", "Configuring")
+    keystone_relations = hookenv.relations_of_type("keystone-admin")
+    db_relations = hookenv.relations_of_type("database")
+    config_dir = hookenv.config("config_dir")
+    novarc_file = os.path.join(config_dir, "novarc")
+    custom_novarc = hookenv.config("novarc")
     if len(keystone_relations) > 0 and len(db_relations) > 0:
         write_relation_novarc(novarc_file)
-    elif not custom_novarc == '':
+    elif not custom_novarc == "":
         write_custom_novarc(novarc_file)
     else:
-        hookenv.log('ERROR: set novarc config or add keystone and '
-                    'database relations')
+        hookenv.log("ERROR: set novarc config or add keystone and database relations")
         if os.path.isfile(novarc_file):
             os.remove(novarc_file)
-            clear_flag('novarc.configured')
-        hookenv.status_set('blocked', 'Set novarc config or add keystone '
-                           'and database relations')
+            clear_flag("novarc.configured")
+        hookenv.status_set(
+            "blocked", "Set novarc config or add keystone and database relations"
+        )
 
 
 def write_relation_novarc(path):  # noqa: C901 is too complex (14)
     """Write 'novarc' file."""
-    hookenv.status_set('maintenance', 'Configuring novarc')
-    hookenv.log('configuring novarc based on keystone relation')
+    hookenv.status_set("maintenance", "Configuring novarc")
+    hookenv.log("configuring novarc based on keystone relation")
     # TODO: replace this with some better way to get the master region
     # name available. Query from the client doesn't have permissions,
     # it is in 'clouds.yaml'. Possible alternative is to use a cross model
     # relation.
     context = {}
-    clouds_yaml_dir = '/etc/openstack'
-    master_creds_set = hookenv.config('master_creds')
-    master_enabled = hookenv.config('master_mode')
+    clouds_yaml_dir = "/etc/openstack"
+    master_creds_set = hookenv.config("master_creds")
+    master_enabled = hookenv.config("master_mode")
     if master_enabled:
-        keystone = hookenv.relations_of_type('keystone-admin')
+        keystone = hookenv.relations_of_type("keystone-admin")
         if len(keystone) > 0:
             relation = keystone[0]
-        if 'service_password' in relation and relation['service_password']:
-            context['keystone'] = copy(relation)
-    elif not master_enabled and master_creds_set != '':
+        if "service_password" in relation and relation["service_password"]:
+            context["keystone"] = copy(relation)
+    elif not master_enabled and master_creds_set != "":
         if not os.path.exists(clouds_yaml_dir):
             configure_master_novarc()
-        keystone_creds = config_flags_parser(hookenv
-                                             .config('master_creds'))
-        context['keystone_master_region'] = keystone_creds['region']
-        keystone = hookenv.relations_of_type('keystone-admin')
+        keystone_creds = config_flags_parser(hookenv.config("master_creds"))
+        context["keystone_master_region"] = keystone_creds["region"]
+        keystone = hookenv.relations_of_type("keystone-admin")
         if len(keystone) > 0:
-            filtered_keystone = ([x for x in keystone
-                                 if 'service_password' in x])
+            filtered_keystone = [x for x in keystone if "service_password" in x]
             if len(filtered_keystone) > 0:
-                context['keystone'] = copy(filtered_keystone[0])
+                context["keystone"] = copy(filtered_keystone[0])
     else:
-        if master_creds_set == '':
-            hookenv.log('master_creds missing')
-            hookenv.status_set('blocked',
-                               'Please add master_creds')
-    mysql = hookenv.relations_of_type('database')
+        if master_creds_set == "":
+            hookenv.log("master_creds missing")
+            hookenv.status_set("blocked", "Please add master_creds")
+    mysql = hookenv.relations_of_type("database")
     if len(mysql) > 0:
         relation = mysql[0]
-        context['db'] = copy(relation)
+        context["db"] = copy(relation)
     if len(context.keys()) == 2:
         templating.render(
-            source='novarc_master.j2',
+            source="novarc_master.j2",
             target=path,
-            owner='ubuntu',
-            group='ubuntu',
+            owner="ubuntu",
+            group="ubuntu",
             perms=0o600,
             context=context,
         )
-        hookenv.status_set('active', 'Unit is ready')
+        hookenv.status_set("active", "Unit is ready")
     elif len(context.keys()) == 3:
         templating.render(
-            source='novarc_slave.j2',
+            source="novarc_slave.j2",
             target=path,
-            owner='ubuntu',
-            group='ubuntu',
+            owner="ubuntu",
+            group="ubuntu",
             perms=0o600,
             context=context,
         )
-        hookenv.status_set('active', 'Unit is ready')
-    elif 'db' not in context.keys():
-        hookenv.status_set('maintenance',
-                           'mysql relation incomplete')
-    elif 'keystone' not in context.keys():
-        hookenv.status_set('maintenance',
-                           'keystone relation incomplete')
+        hookenv.status_set("active", "Unit is ready")
+    elif "db" not in context.keys():
+        hookenv.status_set("maintenance", "mysql relation incomplete")
+    elif "keystone" not in context.keys():
+        hookenv.status_set("maintenance", "keystone relation incomplete")
     else:
-        hookenv.status_set('maintenance', 'keystone and '
-                           'mysql relation incomplete')
+        hookenv.status_set("maintenance", "keystone and mysql relation incomplete")
 
 
 def write_custom_novarc(path):
@@ -536,172 +512,164 @@ def write_custom_novarc(path):
     # To add a custom novarc file, run:
     # `juju config <glance-sync-application>
     # novarc=$(base64 -w 0 /path/to/novarc)`
-    hookenv.status_set('maintenance',
-                       'Configuring custom novarc')
-    hookenv.log('configuring custom novarc')
-    novarc = hookenv.config('novarc')
+    hookenv.status_set("maintenance", "Configuring custom novarc")
+    hookenv.log("configuring custom novarc")
+    novarc = hookenv.config("novarc")
     novarc_bytestring = base64.b64decode(novarc)
-    with open(path, 'wb') as f:
+    with open(path, "wb") as f:
         f.write(novarc_bytestring)
-        os.chown(path,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(path, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
         os.chmod(path, 0o600)
-    clouds_yaml_dir = '/etc/openstack'
-    master_creds_set = hookenv.config('master_creds')
-    master_enabled = hookenv.config('master_mode')
+    clouds_yaml_dir = "/etc/openstack"
+    master_creds_set = hookenv.config("master_creds")
+    master_enabled = hookenv.config("master_mode")
     if master_enabled:
-        hookenv.status_set('active', 'Unit is ready')
+        hookenv.status_set("active", "Unit is ready")
         return
-    elif not master_enabled and master_creds_set != '':
+    elif not master_enabled and master_creds_set != "":
         if not os.path.exists(clouds_yaml_dir):
             configure_master_novarc()
-        hookenv.status_set('active', 'Unit is ready')
+        hookenv.status_set("active", "Unit is ready")
     else:
-        if master_creds_set == '':
-            hookenv.log('ERROR: master_creds missing')
-            hookenv.status_set('blocked',
-                               'Please add master_creds')
+        if master_creds_set == "":
+            hookenv.log("ERROR: master_creds missing")
+            hookenv.status_set("blocked", "Please add master_creds")
 
 
-@when('config.changed.sync_source')
+@when("config.changed.sync_source")
 def configure_sync_source():
     """Configure cron after 'sync_source' config change."""
     configure_cron()
 
 
-@when_any('config.changed.sync_enabled',
-          'config.changed.cron_frequency')
+@when_any("config.changed.sync_enabled", "config.changed.cron_frequency")
 def configure_cron():
     """
     Configure cron after 'sync_enabled' or
     'cron_frequency' config change.
     """
-    hookenv.status_set('maintenance', 'Configuring')
-    sync_enabled = hookenv.config('sync_enabled')
-    hookenv.log('configuring sync cronjob')
-    master_enabled = hookenv.config('master_mode')
+    hookenv.status_set("maintenance", "Configuring")
+    sync_enabled = hookenv.config("sync_enabled")
+    hookenv.log("configuring sync cronjob")
+    master_enabled = hookenv.config("master_mode")
     if master_enabled:
-        cron_file = '/etc/cron.d/glance_sync_master'
+        cron_file = "/etc/cron.d/glance_sync_master"
     else:
-        cron_file = '/etc/cron.d/glance_sync_slave'
-        if not hookenv.config('sync_source'):
-            hookenv.log('ERROR: sync_source not set')
-            hookenv.status_set('blocked', 'Please set a '
-                               'sync_source to configure crontab')
+        cron_file = "/etc/cron.d/glance_sync_slave"
+        if not hookenv.config("sync_source"):
+            hookenv.log("ERROR: sync_source not set")
+            hookenv.status_set(
+                "blocked", "Please set a sync_source to configure crontab"
+            )
             return
 
     if sync_enabled and master_enabled:
-        hookenv.log('adding cronjob')
+        hookenv.log("adding cronjob")
         templating.render(
-            source='glance_sync_master_cron.j2',
+            source="glance_sync_master_cron.j2",
             target=cron_file,
-            owner='root',
-            group='root',
+            owner="root",
+            group="root",
             perms=0o640,
             context=hookenv.config(),
         )
     elif sync_enabled and not master_enabled:
         # Just an alias to make sure that the paths are as expected.
         context = hookenv.config()
-        if context['sync_source'][-1] != '/':
-            context['sync_source'] += '/'
-        if context['data_dir'][-1] != '/':
-            context['data_dir'] += '/'
-        hookenv.log('adding cronjob')
+        if context["sync_source"][-1] != "/":
+            context["sync_source"] += "/"
+        if context["data_dir"][-1] != "/":
+            context["data_dir"] += "/"
+        hookenv.log("adding cronjob")
         templating.render(
-            source='glance_sync_slave_cron.j2',
+            source="glance_sync_slave_cron.j2",
             target=cron_file,
-            owner='root',
-            group='root',
+            owner="root",
+            group="root",
             perms=0o640,
             context=hookenv.config(),
         )
     else:
-        hookenv.log('removing cronjob')
+        hookenv.log("removing cronjob")
         if os.path.isfile(cron_file):
             os.remove(cron_file)
-            clear_flag('cron.configured')
+            clear_flag("cron.configured")
     configure_novarc()
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@hook('nrpe-external-master-relation-changed')
+@hook("nrpe-external-master-relation-changed")
 def setup_nrpe_checks(nagios):
     """Configure NRPE checks."""
-    hookenv.status_set('maintenance', 'Configuring nrpe checks')
+    hookenv.status_set("maintenance", "Configuring nrpe checks")
     config = hookenv.config()
-    modes = ['slave', 'master']
+    modes = ["slave", "master"]
 
     for mode in modes:
         nagios.add_check(
             [
-                '/usr/lib/nagios/plugins/check_file_age',
-                '-w 14400', '-c 25200', '-i', '-f',
-                os.path.join(
-                    config['log_dir'],
-                    'glance_sync_' + mode + '.log'
-                ),
+                "/usr/lib/nagios/plugins/check_file_age",
+                "-w 14400",
+                "-c 25200",
+                "-i",
+                "-f",
+                os.path.join(config["log_dir"], "glance_sync_" + mode + ".log"),
             ],
-            name='glance_sync_' + mode + '_log',
-            description=(
-                'Verify age of last image sync '
-                'from glance to disk'
-            ),
-            context=config['nagios_context'],
+            name="glance_sync_" + mode + "_log",
+            description=("Verify age of last image sync from glance to disk"),
+            context=config["nagios_context"],
             unit=hookenv.local_unit(),
         )
 
     # Copy nrpe check plugin for stale lockfiles in place.
-    script_dir = hookenv.config('script_dir')
-    files = ['check_stale_lockfile_slave.py',
-             'check_stale_lockfile_master.py']
-    hookenv.log('installing stale lockfile nrpe plugin')
+    script_dir = hookenv.config("script_dir")
+    files = ["check_stale_lockfile_slave.py", "check_stale_lockfile_master.py"]
+    hookenv.log("installing stale lockfile nrpe plugin")
     for file in files:
-        source = os.path.join(hookenv.charm_dir(), 'files', file)
+        source = os.path.join(hookenv.charm_dir(), "files", file)
         dest = os.path.join(script_dir, file)
         if not os.path.exists(os.path.dirname(dest)):
             os.makedirs(os.path.dirname(dest))
         shutil.copy(source, dest)
-        os.chown(dest,
-                 pwd.getpwnam('ubuntu').pw_uid,
-                 grp.getgrnam('ubuntu').gr_gid)
+        os.chown(dest, pwd.getpwnam("ubuntu").pw_uid, grp.getgrnam("ubuntu").gr_gid)
         os.chmod(dest, 0o755)
 
     for mode in modes:
-        nrpe_plugin = os.path.join(script_dir,
-                                   'check_stale_lockfile_' +  # noqa:W504
-                                   mode + '.py')
+        nrpe_plugin = os.path.join(
+            script_dir, "check_stale_lockfile_" + mode + ".py"  # noqa:W504
+        )
         nagios.add_check(
             [
                 nrpe_plugin,
-                '-f', '/tmp/glance_sync_' + mode + '.lock',
-                '-w 72000', '-c 14400',
+                "-f",
+                "/tmp/glance_sync_" + mode + ".lock",
+                "-w 72000",
+                "-c 14400",
             ],
-            name='glance_sync_' + mode + '_lockfile',
-            description='Verify age of image sync lockfile',
-            context=config['nagios_context'],
+            name="glance_sync_" + mode + "_lockfile",
+            description="Verify age of image sync lockfile",
+            context=config["nagios_context"],
             unit=hookenv.local_unit(),
         )
 
-    hookenv.status_set('active', 'Unit is ready')
+    hookenv.status_set("active", "Unit is ready")
 
 
-@when('config.changed.trusted_ssl_ca')
+@when("config.changed.trusted_ssl_ca")
 def fix_ssl():
     """
     Write user supplied SSL CA from 'trusted_ssl_ca' to
     'cert_file', and run `update-ca-certificates`.
     """
-    cert_file = '/usr/local/share/ca-certificates/openstack-service-checks.crt'
+    cert_file = "/usr/local/share/ca-certificates/openstack-service-checks.crt"
     config = hookenv.config()
-    trusted_ssl_ca = config.get('trusted_ssl_ca').strip()
-    hookenv.log('writing ssl ca cert:{}'.format(trusted_ssl_ca))
+    trusted_ssl_ca = config.get("trusted_ssl_ca").strip()
+    hookenv.log("writing ssl ca cert:{}".format(trusted_ssl_ca))
     cert_content = base64.b64decode(trusted_ssl_ca).decode()
-    with open(cert_file, 'w') as f:
+    with open(cert_file, "w") as f:
         print(cert_content, file=f)
     try:
-        subprocess.call(['/usr/sbin/update-ca-certificates'])
+        subprocess.call(["/usr/sbin/update-ca-certificates"])
     except subprocess.CalledProcessError as e:
-        hookenv.log('ERROR: fix_ssl() failed with {}'.format(e))
-        hookenv.status_set('error', 'CA cert update failed')
+        hookenv.log("ERROR: fix_ssl() failed with {}".format(e))
+        hookenv.status_set("error", "CA cert update failed")
diff --git a/src/tests/functional/tests/test_glance_sync.py b/src/tests/functional/tests/test_glance_sync.py
index e03511b..0d6e981 100644
--- a/src/tests/functional/tests/test_glance_sync.py
+++ b/src/tests/functional/tests/test_glance_sync.py
@@ -48,9 +48,10 @@ class BaseGlanceSyncTest(unittest.TestCase):
         )
         b64_ssh_key = base64.b64encode(cls.slave_ssh_key.encode())
         master_config = {"authorized_keys": b64_ssh_key.decode()}
-        slave_config = {"master_creds": master_creds,
-                        "sync_source": "ubuntu@{}:/srv/glance_sync/data".format(cls.master_ip),
-                        }
+        slave_config = {
+            "master_creds": master_creds,
+            "sync_source": "ubuntu@{}:/srv/glance_sync/data".format(cls.master_ip),
+        }
         model.set_application_config(cls.master_app, master_config)
         model.set_application_config(cls.slave_app, slave_config)
 
@@ -72,23 +73,24 @@ class CharmOperationTest(BaseGlanceSyncTest):
         # Upload a Glance image to use for test, doesn't need to be big or even real
         openstack.enable_logging(debug=True)
         conn_master = openstack.connection.Connection(
-            region_name='RegionOne',
+            region_name="RegionOne",
             auth=dict(
-                auth_url='http://{}:35357/v3'.format(self.keystone_master_ip),
-                username='admin',
+                auth_url="http://{}:35357/v3".format(self.keystone_master_ip),
+                username="admin",
                 password=self.master_password,
-                project_name='admin',
-                user_domain_name='admin_domain',
-                project_domain_name='admin_domain',
+                project_name="admin",
+                user_domain_name="admin_domain",
+                project_domain_name="admin_domain",
             ),
-            compute_api_version='2',
-            identity_interface='public')
+            compute_api_version="2",
+            identity_interface="public",
+        )
         image_attrs = {
-            'name': 'zaza_test_image',
-            'data': 'some_test_data',
-            'disk_format': 'raw',
-            'container_format': 'bare',
-            'visibility': 'public',
+            "name": "zaza_test_image",
+            "data": "some_test_data",
+            "disk_format": "raw",
+            "container_format": "bare",
+            "visibility": "public",
         }
         self.image = conn_master.image.upload_image(**image_attrs)
         # Has image.id, image.created, image.name for future use
@@ -97,21 +99,22 @@ class CharmOperationTest(BaseGlanceSyncTest):
     def test_02_check_slave(self):
         """Check that the previously uploaded image lands on the slave.
 
-        Run a loop till timeout, that checks Glance in the slave region for the presence of the
-        image uploaded to the master.
+        Run a loop until timeout, that checks glance in the slave region
+        for the presence of the image uploaded to the master.
         """
         conn_slave = openstack.connection.Connection(
-            region_name='RegionOne',
+            region_name="RegionOne",
             auth=dict(
-                auth_url='http://{}:35357/v3'.format(self.keystone_slave_ip),
-                username='admin',
+                auth_url="http://{}:35357/v3".format(self.keystone_slave_ip),
+                username="admin",
                 password=self.slave_password,
-                project_name='admin',
-                user_domain_name='admin_domain',
-                project_domain_name='admin_domain',
+                project_name="admin",
+                user_domain_name="admin_domain",
+                project_domain_name="admin_domain",
             ),
-            compute_api_version='2',
-            identity_interface='public')
+            compute_api_version="2",
+            identity_interface="public",
+        )
         timeout = time.time() + TEST_TIMEOUT
         while time.time() < timeout:
             image_list = conn_slave.get_image("zaza_test_image")
diff --git a/src/tests/unit/__init__.py b/src/tests/unit/__init__.py
index 03acc40..28e9795 100644
--- a/src/tests/unit/__init__.py
+++ b/src/tests/unit/__init__.py
@@ -1,2 +1,3 @@
 import sys
-sys.path.append('.')
+
+sys.path.append(".")
diff --git a/src/tox.ini b/src/tox.ini
index cd1b1f7..45ced91 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -25,7 +25,7 @@ passenv =
 [testenv:lint]
 commands =
     flake8
-#TODO    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
+    black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
 deps =
     black
     flake8
@@ -45,8 +45,7 @@ exclude =
     mod,
     .build
 
-max-line-length = 120
-#TODO max-line-length = 88
+max-line-length = 88
 max-complexity = 10
 
 [testenv:black]