From 5986959597be3accb975fec5ed0b126180b069fa Mon Sep 17 00:00:00 2001 From: AJ Bourg Date: Fri, 23 May 2014 14:47:46 -0600 Subject: [PATCH] Remove some development code. EC2 -> SoftLayer --- plugins/inventory/softlayer.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/inventory/softlayer.py b/plugins/inventory/softlayer.py index 2535afc97e..76112f2201 100755 --- a/plugins/inventory/softlayer.py +++ b/plugins/inventory/softlayer.py @@ -72,7 +72,7 @@ class SoftLayerInventory(object): def parse_options(self): '''Parse all the arguments from the CLI''' - parser = argparse.ArgumentParser(description='Produce an Ansible Inventory file based on EC2') + parser = argparse.ArgumentParser(description='Produce an Ansible Inventory file based on SoftLayer') parser.add_argument('--list', action='store_true', default=False, help='List instances (default: False)') parser.add_argument('--host', action='store', @@ -103,9 +103,8 @@ class SoftLayerInventory(object): if 'hardwareStatusId' in instance and instance['hardwareStatusId'] != 5: return + # if there's no IP address, we can't reach it if 'primaryIpAddress' not in instance: - print instance['fullyQualifiedDomainName'] + " doesn't have an ip!" - print instance return dest = instance['primaryIpAddress'] @@ -160,4 +159,4 @@ class SoftLayerInventory(object): self.get_virtual_servers() self.get_physical_servers() -SoftLayerInventory() \ No newline at end of file +SoftLayerInventory()