Add Terraform outputs as extra variables

src/ati/cli.py

@@ -8,11 +8,11 @@
 import json
 import os
 
-from ati import __name__, __version__ 
+from ati import __name__, __version__
 from ati.terraform import (
     get_stage_root, iterhosts, iterresources,
     query_host, query_hostfile, query_list, tfstates,
-    iter_states)
+    iter_states, terraform_outputs)
 
 def get_args():
     parser = argparse.ArgumentParser(
@@ -45,7 +45,7 @@ def get_args():
     # extra aws args
     parser.add_argument('--aws_name_key',
                         # also defaulted in ati.terraform.aws_host
-                        default='tags.Name', 
+                        default='tags.Name',
                         action='store',
                         help='resouce attribute key to use as a name')
     parser.add_argument('--aws_ssh_host_key',
@@ -73,9 +73,12 @@ def cli():
         parser.exit()
 
     if args.noterraform:
-        hosts = iterhosts(iterresources(tfstates(args.root)), args)
+        states = list(tfstates(args.root))
     else:
-        hosts = iterhosts(iterresources(iter_states(args.root)), args)
+        states = list(iter_states(args.root))
+
+    outputs = terraform_outputs(states)
+    hosts = iterhosts(iterresources(states), args, outputs)
 
     if args.list:
         output = query_list(hosts)

src/ati/terraform.py

@@ -52,17 +52,29 @@ def iter_states(root=None):
 
 def iterresources(sources):
     for source in sources:
-	if type(source) in [unicode, str]:
+        if type(source) in [unicode, str]:
             with open(source, 'r') as json_file:
                 state = json.load(json_file)
-	else:
-	    state = source
+        else:
+            state = source
         for module in state['modules']:
             name = module['path'][-1]
             for key, resource in list(module['resources'].items()):
                 yield name, key, resource
 
 
+def terraform_outputs(sources):
+    for source in sources:
+        if type(source) in [unicode, str]:
+            with open(source, 'r') as json_file:
+                state = json.load(json_file)
+        else:
+            state = source
+        for module in state['modules']:
+            for key, value in module['outputs'].items():
+                yield key, value['value']
+
+
 def get_stage_root(tf_dirname=None, root=None):
     """Look for a terraform root directory to match the inventory root directory.
 
@@ -101,7 +113,7 @@ def _clean_dc(dcname):
     return re.sub('[^\w_\-]', '-', dcname)
 
 
-def iterhosts(resources, args):
+def iterhosts(resources, args, outputs):
     '''yield host tuples of (name, attributes, groups)'''
     for module_name, key, resource in resources:
         resource_type, name = key.split('.', 1)
@@ -110,7 +122,7 @@ def iterhosts(resources, args):
         except KeyError:
             continue
 
-        yield parser(resource, module_name, args=args)
+        yield parser(resource, module_name, args=args, outputs=outputs)
 
 
 def parses(prefix):
@@ -604,6 +616,10 @@ def aws_host(resource, module_name, **kwargs):
     groups.append('role=' + attrs['role'])
     groups.append('dc=' + attrs['consul_dc'])
 
+    # add outputs to attrs
+    for (k, v) in kwargs.get('outputs', []):
+        attrs[k] = v
+
     return name, attrs, groups