Merge "Represent image prepare defaults in new heat param format"

tripleo_common/image/kolla_builder.py

@@ -25,19 +25,21 @@ import yaml
 from tripleo_common.image import base
 from tripleo_common.image import image_uploader
 
-
+CONTAINER_IMAGE_PREPARE_PARAM = [{
-CONTAINER_IMAGES_DEFAULTS = {
-    'namespace': 'docker.io/tripleomaster',
-    'ceph_namespace': 'docker.io/ceph',
-    'ceph_image': 'daemon',
-    'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
-    'name_prefix': 'centos-binary-',
-    'name_suffix': '',
     'tag_from_label': 'rdo_version',
-    'tag': 'current-tripleo',
+    'set': {
-    'neutron_driver': None,
+        'namespace': 'docker.io/tripleomaster',
-}
+        'ceph_namespace': 'docker.io/ceph',
+        'ceph_image': 'daemon',
+        'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
+        'name_prefix': 'centos-binary-',
+        'name_suffix': '',
+        'tag': 'current-tripleo',
+        'neutron_driver': None,
+    }
+}]
 
+CONTAINER_IMAGES_DEFAULTS = CONTAINER_IMAGE_PREPARE_PARAM[0]['set']
 
 DEFAULT_TEMPLATE_FILE = os.path.join(sys.prefix, 'share', 'tripleo-common',
                                      'container-images',

tripleo_common/tests/image/test_kolla_builder.py

@@ -171,7 +171,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'name_prefix': 'centos-binary-',
                 'name_suffix': '',
                 'tag': 'current-tripleo',
-                'tag_from_label': 'rdo_version',
                 'neutron_driver': None
             },
             builder.container_images_template_inputs()
@@ -186,7 +185,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'name_prefix': 'prefix-',
                 'name_suffix': '-suffix',
                 'tag': 'master',
-                'tag_from_label': 'rdo_version',
                 'neutron_driver': 'ovn'
             },
             builder.container_images_template_inputs(