Merge lp:~heber013/qakit/adding-image-metadata-option into lp:qakit

[Heber Parrucci]

Adding --image option to bootstrap to allow the option of generating metadata
Also delete files/dirs at the end of execution.

Add the option for generating image metadata in juju script.
Also deleting files/dirs created during the setup

[Max Brustkern (nuclearbob)]

I'd consider using a finally clause in the try block instead of having the delete in the try and the except, but that's just a stylistic thing; should be good to land either way.

review: Approve

[lp:~heber013/qakit/adding-image-metadata-option]

230. By Heber Parrucci on 2017-03-30

Adding finally clause for deleting files/dirs

[Heber Parrucci (heber013)]

Adding finally clause for deleting files/dirs

[Max Brustkern (nuclearbob)]

Looks good to me!

review: Approve

=== modified file 'qakit/juju/juju_bootstrap'
--- qakit/juju/juju_bootstrap	2017-03-28 17:42:58 +0000
+++ qakit/juju/juju_bootstrap	2017-03-30 17:48:15 +0000
@@ -35,10 +35,18 @@
             cloud_name="$2"
             shift # past argument
             ;;
+            --controller_name)
+            controller_name="$2"
+            shift # past argument
+            ;;
             --proxy)
             proxy="$2"
             shift # past argument
             ;;
+            --image)
+            image="$2"
+            shift # past argument
+            ;;
             --replace)
             replace=YES
             ;;
@@ -75,9 +83,22 @@
 
 # Bootstrap juju cloud/controller/model
 parameters="--cloud_name ${cloud_name} --username ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_TENANT_NAME} --region ${OS_REGION_NAME} --url ${OS_AUTH_URL}"
+
 if [ ! -z ${replace} ]; then
     parameters="$parameters --replace"
 fi
+
+if [ ! -z ${image} ]; then
+    parameters="$parameters --image $image"
+fi
+
+# If controller name is not passed as argument, it takes the same name as the cloud
+if [ ! -z ${controller_name} ]; then
+    parameters="$parameters --controller_name $controller_name"
+else
+    parameters="$parameters --controller_name $cloud_name"
+fi
+
 ${DIR}/juju_ve/bin/python3 ${DIR}/juju_bootstrap.py ${parameters}
 bootstrap_result=$?
 if [ ${bootstrap_result} != 0 ]; then

=== modified file 'qakit/juju/juju_bootstrap.py'
--- qakit/juju/juju_bootstrap.py	2017-03-28 17:42:58 +0000
+++ qakit/juju/juju_bootstrap.py	2017-03-30 17:48:15 +0000
@@ -22,6 +22,8 @@
 """Bootstrap a cloud using juju"""
 
 import argparse
+import os
+import shutil
 import subprocess
 import tempfile
 
@@ -36,6 +38,8 @@
 LOGGER.setLevel(logging.DEBUG)
 LOGGER.propagate = True
 
+TO_DELETE = []
+
 
 def is_installed(pgk_name):
     """
@@ -79,6 +83,7 @@
     cloud_yaml = tempfile.NamedTemporaryFile()
     with open(cloud_yaml.name, 'w') as temp:
         temp.write(yaml.dump(clouds_dict))
+    TO_DELETE.append(cloud_yaml.name)
     return cloud_yaml
 
 
@@ -107,6 +112,7 @@
     credentials_yaml = tempfile.NamedTemporaryFile()
     with open(credentials_yaml.name, 'w') as temp:
         temp.write(yaml.dump(credentials_dict))
+    TO_DELETE.append(credentials_yaml.name)
     return credentials_yaml
 
 
@@ -161,38 +167,67 @@
         return False
 
 
-def bootstrap(cloud, username, password, tenant, region, url, replace):
+def generate_image_metadata(image, region, url):
+    LOGGER.info('Generating image metadata for: %s', image)
+    streams = tempfile.mkdtemp()
+    subprocess.check_call(['juju',
+                           'metadata',
+                           'generate-image',
+                           '-i', image,
+                           '-d', streams,
+                           '-r', region,
+                           '-u', url])
+    LOGGER.info('Image metadata generated successfully')
+    TO_DELETE.append(streams)
+    return streams
+
+
+def delete_files(files):
+    """Delete the given list of files/dirs"""
+    for _f in files:
+        if os.path.isfile(_f):
+            os.remove(_f)
+        elif os.path.isdir(_f):
+            shutil.rmtree(_f)
+
+
+def bootstrap(cloud, controller, username, password, tenant, region, url, image, replace):
     """Bootstrap a cloud using juju
 
     :param cloud: the cloud name
+    :param controller: the controller name
     :param username: the username
     :param password: the password
     :param tenant: the tenant name
     :param region: the region name
     :param url: the auth url
+    :param image: id of the image you want to generate metadata for
     :param replace: whether to replace the cloud and
     credentials if exists
     """
-    bootstrapped = is_controller_bootstrapped(cloud)
+    command = ['juju', 'bootstrap', cloud, controller, '--credential', cloud]
+    if image:
+        streams = generate_image_metadata(image, region, url)
+        command.extend(['--metadata-source', streams])
+    bootstrapped = is_controller_bootstrapped(controller)
     if replace and bootstrapped:
         LOGGER.info('Controller %s already bootstrapped. '
-                    'Destroying it before proceeding...', cloud)
-        subprocess.check_call(['juju', 'destroy-controller', cloud,
+                    'Destroying it before proceeding...', controller)
+        subprocess.check_call(['juju', 'destroy-controller', controller,
                                '--destroy-all-models', '-y'])
     elif not replace and bootstrapped:
         LOGGER.info('Controller %s already bootstrapped and '
-                    'replace parameter is not set...Exiting', cloud)
+                    'replace parameter is not set...Exiting', controller)
         return
-    LOGGER.info('About to bootstrap controller %s...', cloud)
+    LOGGER.info('About to bootstrap controller %s...', controller)
     add_cloud(cloud, region, url, replace)
     add_credentials(cloud, username, password, tenant, replace)
-    subprocess.check_call(['juju',
-                           'bootstrap',
-                           cloud,
-                           cloud,
-                           '--credential',
-                           cloud])
-
+    try:
+        subprocess.check_call(command)
+    except subprocess.CalledProcessError:
+        raise
+    finally:
+        delete_files(TO_DELETE)
 
 if __name__ == '__main__':
     PARSER = argparse.ArgumentParser(description=
@@ -200,14 +235,16 @@
     PARSER.add_argument('--cloud_name',
                         help='Cloud name that will be also use '
                              'for controller name')
+    PARSER.add_argument('--controller_name')
     PARSER.add_argument('--username')
     PARSER.add_argument('--password')
     PARSER.add_argument('--tenant')
     PARSER.add_argument('--region')
     PARSER.add_argument('--url')
+    PARSER.add_argument('--image')
     PARSER.add_argument('--replace', action='store_true')
     ARGS = PARSER.parse_args()
     add_ppas(PPAS)
     install_packages(PACKAGES)
-    bootstrap(ARGS.cloud_name, ARGS.username, ARGS.password, ARGS.tenant,
-              ARGS.region, ARGS.url, ARGS.replace)
+    bootstrap(ARGS.cloud_name, ARGS.controller_name, ARGS.username, ARGS.password, ARGS.tenant,
+              ARGS.region, ARGS.url, ARGS.image, ARGS.replace)