aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'keystone-moon/keystone/contrib')
-rw-r--r--keystone-moon/keystone/contrib/moon/controllers.py3
-rw-r--r--keystone-moon/keystone/contrib/moon/core.py6
2 files changed, 5 insertions, 4 deletions
diff --git a/keystone-moon/keystone/contrib/moon/controllers.py b/keystone-moon/keystone/contrib/moon/controllers.py
index b4413dbf..d3f1bfad 100644
--- a/keystone-moon/keystone/contrib/moon/controllers.py
+++ b/keystone-moon/keystone/contrib/moon/controllers.py
@@ -860,6 +860,7 @@ class MoonAuth(controller.V3Controller):
return project
def get_token(self, context, **kw):
+ master_url = CONF.moon.master
data_auth = {
"auth": {
"identity": {
@@ -894,7 +895,7 @@ class MoonAuth(controller.V3Controller):
"title": "UnScopedToken"
}}
- req = requests.post("http://localhost:5000/v3/auth/tokens",
+ req = requests.post("{}/v3/auth/tokens".format(master_url),
json=data_auth,
headers={"Content-Type": "application/json"}
)
diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py
index 83657317..943b8e78 100644
--- a/keystone-moon/keystone/contrib/moon/core.py
+++ b/keystone-moon/keystone/contrib/moon/core.py
@@ -54,13 +54,13 @@ OPTS = [
default='policy_root',
help='Local directory where Root IntraExtension configuration is stored.'),
cfg.StrOpt('master',
- default='',
+ default='http://localhost:35357/',
help='Address of the Moon master (if empty, the current Moon is the master).'),
cfg.StrOpt('master_login',
- default='',
+ default='admin',
help='Login of the Moon master.'),
cfg.StrOpt('master_password',
- default='',
+ default='nomoresecrete',
help='Password of the Moon master.'),
]