From 05532448eea2a60a0156527b51d7b8b4c6b959bc Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Tue, 31 Jul 2018 09:55:29 +1200
Subject: [PATCH] Create script tripleo-container-image-prepare

The mistral executor image needs to trigger a container image prepare
via an executable during overcloud stack creation, but adding
python-tripleoclient to the executor image causes significant image
bloat.

This change implements a script equivalent to the command "openstack
tripleo container image prepare" with functionality focused only on
the needs of the caller. The script differs to the full command in the
following ways:
- Only one environment file can be specified, so filtering by
  containerized services is not possible (filtering by roles data is
  still done)
- No output files are generated, this script exists only to do actual
  prepare operations
- --dry-run is not supported
- The printed output is just the image parameter values, not a full
  environment file

Change-Id: I2bd53ac64d6ae7a5bb536fa82b1c70a73d883ba8
Blueprint: container-prepare-workflow
---
 scripts/tripleo-container-image-prepare | 101 ++++++++++++++++++++++++
 setup.cfg                               |   1 +
 2 files changed, 102 insertions(+)
 create mode 100755 scripts/tripleo-container-image-prepare

diff --git a/scripts/tripleo-container-image-prepare b/scripts/tripleo-container-image-prepare
new file mode 100755
index 000000000..4d6525afa
--- /dev/null
+++ b/scripts/tripleo-container-image-prepare
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+# Copyright 2018 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import argparse
+import logging
+import os
+import sys
+
+from tripleo_common import constants
+from tripleo_common.image import image_uploader
+from tripleo_common.image import kolla_builder
+import yaml
+
+
+def rel_or_abs_path(file_path, tht_root):
+    '''Find a file, either absolute path or relative to the t-h-t dir'''
+    if not file_path:
+        return None
+    path = os.path.abspath(file_path)
+    if not os.path.isfile(path):
+        path = os.path.abspath(os.path.join(tht_root, file_path))
+    if not os.path.isfile(path):
+        raise RuntimeError(
+            "Can't find path %s %s" % (file_path, path))
+    return path
+
+
+def fetch_roles_file(roles_file, tht_path=constants.DEFAULT_TEMPLATES_PATH):
+    '''Fetch t-h-t roles data fromm roles_file abs path or rel to tht_path.'''
+    if not roles_file:
+        return None
+    with open(rel_or_abs_path(roles_file, tht_path)) as f:
+        return yaml.safe_load(f)
+
+
+def get_args():
+    parser = argparse.ArgumentParser(
+        description=("tripleo-container-image-prepare"),
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    try:
+        roles_file = rel_or_abs_path(
+            constants.OVERCLOUD_J2_ROLES_NAME,
+            constants.DEFAULT_TEMPLATES_PATH)
+    except RuntimeError:
+        roles_file = None
+    parser.add_argument(
+        '--environment-file', '-e', metavar='<file path>', required=True,
+        help='Environment file containing the ContainerImagePrepare '
+             'parameter which specifies all prepare actions.'
+    )
+    parser.add_argument(
+        '--roles-file', '-r', dest='roles_file',
+        default=roles_file,
+        help='Roles file to filter images by, overrides the default %s'
+             % constants.OVERCLOUD_J2_ROLES_NAME
+    )
+    parser.add_argument(
+        "--cleanup",
+        dest="cleanup",
+        metavar='<full, partial, none>',
+        default=image_uploader.CLEANUP_FULL,
+        help="Cleanup behavior for local images left after upload. "
+             "The default 'full' will attempt to delete all local "
+             "images. 'partial' will leave images required for "
+             "deployment on this host. 'none' will do no cleanup."
+    )
+    args = parser.parse_args(sys.argv[1:])
+    return args
+
+if __name__ == '__main__':
+    args = get_args()
+
+    logging.basicConfig()
+    log = logging.getLogger()
+    log.setLevel(logging.INFO)
+
+    if args.cleanup not in image_uploader.CLEANUP:
+        raise RuntimeError('--cleanup must be one of: %s' %
+                           ', '.join(image_uploader.CLEANUP))
+
+    roles_data = fetch_roles_file(args.roles_file)
+
+    with open(args.environment_file) as f:
+        env = yaml.safe_load(f)
+
+    params = kolla_builder.container_images_prepare_multi(
+        env, roles_data, cleanup=args.cleanup)
+    print(yaml.safe_dump(params, default_flow_style=False))
diff --git a/setup.cfg b/setup.cfg
index 667d859da..4376c7652 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,6 +31,7 @@ scripts =
     scripts/run-validation
     scripts/tripleo-build-images
     scripts/tripleo-config-download
+    scripts/tripleo-container-image-prepare
     scripts/upload-puppet-modules
     scripts/upload-swift-artifacts