incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [22/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration - cli: cachemaker should import config and not the field
Date Thu, 21 Mar 2013 05:22:09 GMT
cli: cachemaker should import config and not the field

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e28aa09f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e28aa09f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e28aa09f

Branch: refs/heads/cisco-vnmc-api-integration
Commit: e28aa09f01fcaf6abd806ab94d962563e1fba6c2
Parents: 93bc669
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Tue Mar 19 15:47:51 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Tue Mar 19 16:05:11 2013 +0530

----------------------------------------------------------------------
 tools/cli/cloudmonkey/cachemaker.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e28aa09f/tools/cli/cloudmonkey/cachemaker.py
----------------------------------------------------------------------
diff --git a/tools/cli/cloudmonkey/cachemaker.py b/tools/cli/cloudmonkey/cachemaker.py
index 42a077a..8ac123c 100644
--- a/tools/cli/cloudmonkey/cachemaker.py
+++ b/tools/cli/cloudmonkey/cachemaker.py
@@ -21,7 +21,7 @@ try:
     import os
     import types
 
-    from config import cache_file
+    from config import config_fields
 except ImportError, e:
     import sys
     print "ImportError", e
@@ -168,6 +168,7 @@ def main(json_file):
     f.close()
 
 if __name__ == "__main__":
+    cache_file = config_fields['core']['cache_file']
     print "[cachemaker] Pre-caching using user's cloudmonkey cache", cache_file
     if os.path.exists(cache_file):
         main(cache_file)


Mime
View raw message