Inventory does not require changes in display

Author: mstanescu_adobe

src/ops/cli/inventory.py

@@ -55,8 +55,8 @@ def run(self, args, extra_args):
             group_string = ", ".join(group_names)
             host_id = host.vars.get('ec2_InstanceId', '')
             if host_id != '':
-                name_and_id = "%s -- %s"  % (stringc(self.get_ec2_hostname(host), 'blue'),
-                                            stringc(host.name, 'blue'))
+                name_and_id = "%s -- %s" % (stringc(host.name,
+                                                    'blue'), stringc(host_id, 'blue'))
             else:
                 name_and_id = "%s" % stringc(host.name, 'blue')
             display("%s (%s)" % (name_and_id, stringc(group_string, 'green')))
@@ -68,9 +68,6 @@ def get_inventory_hosts(self, args):
 
         return self.ansible_inventory.get_hosts(limit)
 
-    def get_ec2_hostname(self, host):
-        return host.vars.get('ec2_tag_hostname') or host.vars.get('ec2_tag_Adobe_FQDN') or host.vars.get('ec2_tag_CMDB_hostname') or ''
-
     def get_host_facts(self, host, indent="\t"):
         vars = host.get_vars()
         ret = yaml.dump(