Merge "Add handling for no -e param in CIP" into stable/wallaby

tripleoclient/tests/v1/test_container_image.py

@@ -916,6 +916,28 @@ class TestTripleoImagePrepareDefault(TestPluginV1):
         }
         self.assertEqual(expected, yaml.safe_load(result))
 
+    def test_prepare_default_no_env(self):
+        arglist = []
+        verifylist = []
+
+        self.app.command_options = [
+            'tripleo', 'container', 'image', 'prepare'
+        ] + arglist
+        self.cmd.app.stdout = StringIO()
+        cmd = container_image.TripleOImagePrepareDefault(self.app, None)
+
+        parsed_args = self.check_parser(cmd, arglist, verifylist)
+        cmd.take_action(parsed_args)
+
+        result = self.app.stdout.getvalue()
+        expected_param = kolla_builder.CONTAINER_IMAGE_PREPARE_PARAM
+        expected = {
+            'parameter_defaults': {
+                'ContainerImagePrepare': expected_param
+            }
+        }
+        self.assertEqual(expected, yaml.safe_load(result))
+
     def test_prepare_default_local_registry(self):
         temp = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, temp)

tripleoclient/v1/container_image.py

@@ -1072,7 +1072,8 @@ class TripleOImagePrepare(command.Command):
         env_dirs = [os.path.abspath(x)
                     for x in parsed_args.environment_directories]
         env_files = [os.path.abspath(x)
-                     for x in parsed_args.environment_files]
+                     for x in (parsed_args.environment_files or [])]
+
         extra_vars = {
             "roles_file": role_file,
             "environment_directories": env_dirs,