Decide image_type based on the template contents

To figure out whether to include cfntools in the image, heat-jeos used
to look at the template filename.

Now it uses a more flexible solution: if the template has the
'files/file' declaration for each of the cfntools file, it's contenst
will be included.

Fixes #10

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>

1 files changed, 1 insertions, 5 deletions

diff --git a/bin/heat-jeos b/bin/heat-jeos
index 35929d2..2d4bf82 100755
--- a/bin/heat-jeos
+++ b/bin/heat-jeos
@@ -110,9 +110,6 @@ def command_create(options, arguments):
                   "and check your credentials.")
             sys.exit(1)
 
-    splitname = os.path.basename(tdl_path).split('-')
-    instance_type = splitname[2]
-
     with open(tdl_path, 'r') as f:
         tdl_xml = f.read()
     oz_guest = get_oz_guest(tdl_xml)
@@ -124,8 +121,7 @@ def command_create(options, arguments):
             'found on disk. Do you want to build a fresh JEOS? (y/n) ')
 
     if should_build_jeos:
-        final_tdl = create_tdl(tdl_xml, instance_type, options.iso,
-                               options.cfn_dir)
+        final_tdl = create_tdl(tdl_xml, options.iso, options.cfn_dir)
 
         logging.info('Creating JEOS image (%s) - '
                      'this takes approximately 10 minutes.' % image_name)