git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug in update_membership_list, oldRecord might be None
[sfa.git]
/
geni-config-tty
diff --git
a/geni-config-tty
b/geni-config-tty
index
2fc9896
..
dae6c6a
100755
(executable)
--- a/
geni-config-tty
+++ b/
geni-config-tty
@@
-16,7
+16,7
@@
import os
import re
import readline
import traceback
import re
import readline
import traceback
-import distutils
+import distutils
.file_util
from optparse import OptionParser
from geni.util.config import Config
from optparse import OptionParser
from geni.util.config import Config
@@
-24,7
+24,7
@@
from geni.util.hierarchy import *
from geni.util.misc import *
from geni.util.misc import *
-
usual_variables
= ["GENI_REGISTRY_ROOT_AUTH",
+
all_variables
= ["GENI_REGISTRY_ROOT_AUTH",
"GENI_REGISTRY_LEVEL1_AUTH",
"GENI_REGISTRY_ENABLED",
"GENI_REGISTRY_HOST",
"GENI_REGISTRY_LEVEL1_AUTH",
"GENI_REGISTRY_ENABLED",
"GENI_REGISTRY_HOST",
@@
-41,6
+41,11
@@
usual_variables = ["GENI_REGISTRY_ROOT_AUTH",
"GENI_PLC_PORT",
"GENI_PLC_API_PATH"
]
"GENI_PLC_PORT",
"GENI_PLC_API_PATH"
]
+usual_variables = ["GENI_REGISTRY_ROOT_AUTH",
+ "GENI_REGISTRY_LEVEL1_AUTH",
+ "GENI_PLC_USER",
+ "GENI_PLC_PASSWORD",
+ ]
mainloop_usage= """Available commands:
mainloop_usage= """Available commands:
@@
-247,7
+252,7
@@
def setup_server_key(config_dict):
hrn_leaf = get_leaf(hrn)
if not hrn_leaf:
hrn_leaf = hrn
hrn_leaf = get_leaf(hrn)
if not hrn_leaf:
hrn_leaf = hrn
- new_server_key = os.sep.join([path, auth_path, hrn_leaf])
+ new_server_key = os.sep.join([path, auth_path, hrn_leaf])
+ ".pkey"
old_server_key = os.sep.join([path, key])
old_server_cert = os.sep.join([path, cert])
old_server_key = os.sep.join([path, key])
old_server_cert = os.sep.join([path, cert])