Update digital_ocean.py script from Ansible repository.

Author: geerlingguy

dynamic-inventory/digitalocean/digital_ocean.py

@@ -149,10 +149,7 @@
 except ImportError:
     import configparser as ConfigParser
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
+import json
 
 
 class DoManager:
@@ -224,7 +221,7 @@ def show_droplet(self, droplet_id):
         return resp['droplet']
 
     def all_tags(self):
-        resp = self.send('tags/')
+        resp = self.send('tags')
         return resp['tags']
 
 
@@ -323,7 +320,7 @@ def __init__(self):
 
     def read_settings(self):
         """ Reads the settings from the digital_ocean.ini file """
-        config = ConfigParser.SafeConfigParser()
+        config = ConfigParser.ConfigParser()
         config_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'digital_ocean.ini')
         config.read(config_path)
 
@@ -429,6 +426,21 @@ def load_from_digital_ocean(self, resource=None):
             self.data['tags'] = self.manager.all_tags()
             self.cache_refreshed = True
 
+    def add_inventory_group(self, key):
+        """ Method to create group dict """
+        host_dict = {'hosts': [], 'vars': {}}
+        self.inventory[key] = host_dict
+        return
+
+    def add_host(self, group, host):
+        """ Helper method to reduce host duplication """
+        if group not in self.inventory:
+            self.add_inventory_group(group)
+
+        if host not in self.inventory[group]['hosts']:
+            self.inventory[group]['hosts'].append(host)
+        return
+
     def build_inventory(self):
         """ Build Ansible inventory of droplets """
         self.inventory = {
@@ -449,8 +461,9 @@ def build_inventory(self):
 
             self.inventory['all']['hosts'].append(dest)
 
-            self.inventory[droplet['id']] = [dest]
-            self.inventory[droplet['name']] = [dest]
+            self.add_host(droplet['id'], dest)
+
+            self.add_host(droplet['name'], dest)
 
             # groups that are always present
             for group in ('digital_ocean',
@@ -459,24 +472,18 @@ def build_inventory(self):
                           'size_' + droplet['size']['slug'],
                           'distro_' + DigitalOceanInventory.to_safe(droplet['image']['distribution']),
                           'status_' + droplet['status']):
-                if group not in self.inventory:
-                    self.inventory[group] = {'hosts': [], 'vars': {}}
-                self.inventory[group]['hosts'].append(dest)
+                self.add_host(group, dest)
 
             # groups that are not always present
             for group in (droplet['image']['slug'],
                           droplet['image']['name']):
                 if group:
                     image = 'image_' + DigitalOceanInventory.to_safe(group)
-                    if image not in self.inventory:
-                        self.inventory[image] = {'hosts': [], 'vars': {}}
-                    self.inventory[image]['hosts'].append(dest)
+                    self.add_host(image, dest)
 
             if droplet['tags']:
                 for tag in droplet['tags']:
-                    if tag not in self.inventory:
-                        self.inventory[tag] = {'hosts': [], 'vars': {}}
-                    self.inventory[tag]['hosts'].append(dest)
+                    self.add_host(tag, dest)
 
             # hostvars
             info = self.do_namespace(droplet)
@@ -541,4 +548,4 @@ def do_namespace(data):
 
 ###########################################################################
 # Run the script
-DigitalOceanInventory()
+DigitalOceanInventory()