From ba08cf8c8e2138ae5de60fb28df7f50d3f45b5cf Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Mon, 14 Dec 2015 16:13:30 -0500
Subject: Updates to ohi to pull cache if specified.  Also require version

---
 inventory/multi_inventory.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'inventory')

diff --git a/inventory/multi_inventory.py b/inventory/multi_inventory.py
index 232f2402d..20fc48aa9 100755
--- a/inventory/multi_inventory.py
+++ b/inventory/multi_inventory.py
@@ -56,15 +56,6 @@ class MultiInventory(object):
         else:
             self.config_file = None # expect env vars
 
-
-    def run(self):
-        '''This method checks to see if the local
-           cache is valid for the inventory.
-
-           if the cache is valid; return cache
-           else the credentials are loaded from multi_inventory.yaml or from the env
-           and we attempt to get the inventory from the provider specified.
-        '''
         # load yaml
         if self.config_file and os.path.isfile(self.config_file):
             self.config = self.load_yaml_config()
@@ -91,6 +82,15 @@ class MultiInventory(object):
         if self.config.has_key('cache_location'):
             self.cache_path = self.config['cache_location']
 
+    def run(self):
+        '''This method checks to see if the local
+           cache is valid for the inventory.
+
+           if the cache is valid; return cache
+           else the credentials are loaded from multi_inventory.yaml or from the env
+           and we attempt to get the inventory from the provider specified.
+        '''
+
         if self.args.get('refresh_cache', None):
             self.get_inventory()
             self.write_to_cache()
-- 
cgit v1.2.1