From 768c93125475f7c41891e7655fdd4d7ec25c851d Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 11 Mar 2009 01:20:42 +0000 Subject: [PATCH] use values defined in config for root_auth and level1_auth --- geni/gimport.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/geni/gimport.py b/geni/gimport.py index d9c871b4..5a138b02 100755 --- a/geni/gimport.py +++ b/geni/gimport.py @@ -38,12 +38,17 @@ else: ## # Two authorities are specified: the root authority and the level1 authority. -root_auth = "plc" -level1_auth = None +#root_auth = "plc" +#level1_auth = None #root_auth = "planetlab" #level1_auth = "planetlab.us" config = Config() + +root_auth = config.GENI_REGISTRY_ROOT_AUTH +level1_auth = config.GENI_REGISTRY_LEVEL1_AUTH +if not level1_auth or level1_auth in ['']: + level1_auth = None keyconvert_fn = config.GENI_BASE_DIR + os.sep + "keyconvert/keyconvert" -- 2.47.0