Removed invirt-web-afs-apache

[invirt/packages/invirt-base.git] / scripts / invirt-getconf

diff --git a/scripts/invirt-getconf b/scripts/invirt-getconf
index 4721212..86b36b7 100755 (executable)
--- a/scripts/invirt-getconf
+++ b/scripts/invirt-getconf
@@ -13,10 +13,10 @@ the YAML configuration; e.g., they cannot contain dots.)
 Examples:
 
   invirt-getconf db.uri
 Examples:
 
   invirt-getconf db.uri

-  invirt-getconf authn.0.type
+  invirt-getconf hosts.0.ip

 """
 
 """
 

-from invirt.config import load
+from invirt import config

 from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 
 from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 

@@ -26,12 +26,6 @@ def main(argv):
     try:
         parser = OptionParser(usage = '%prog [options] key',
                 description = __doc__.strip().split('\n\n')[0])
     try:
         parser = OptionParser(usage = '%prog [options] key',
                 description = __doc__.strip().split('\n\n')[0])

-        parser.add_option('-s', '--src',
-                default = '/etc/invirt/master.yaml',
-                help = 'the source YAML configuration file to read from')
-        parser.add_option('-c', '--cache',
-                default = '/var/lib/invirt/invirt.json',
-                help = 'path to the JSON cache')

         parser.add_option('-r', '--refresh',
                 action = 'store_true',
                 help = 'force the cache to be regenerated')
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
                 help = 'force the cache to be regenerated')

@@ -47,7 +41,7 @@ def main(argv):
         else:
             components = []
 
         else:
             components = []
 

-        conf = load(opts.src, opts.cache, opts.refresh)
+        conf = config.load(opts.refresh)

         for i, component in enumerate(components):
             progress = '.'.join(components[:i])
             if type(conf) not in (dict, list):
         for i, component in enumerate(components):
             progress = '.'.join(components[:i])
             if type(conf) not in (dict, list):