projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Adds support for storing and getting vim creds"
[osm/MON.git]
/
osm_mon
/
plugins
/
OpenStack
/
common.py
diff --git
a/osm_mon/plugins/OpenStack/common.py
b/osm_mon/plugins/OpenStack/common.py
index
70154f2
..
4401d0a
100644
(file)
--- a/
osm_mon/plugins/OpenStack/common.py
+++ b/
osm_mon/plugins/OpenStack/common.py
@@
-26,7
+26,7
@@
import logging
from keystoneclient.v3 import client
from keystoneclient.v3 import client
-from plugins.OpenStack.settings import Config
+from
osm_mon.
plugins.OpenStack.settings import Config
import requests
import requests
@@
-97,8
+97,8
@@
class Common(object):
try:
return self._ks.service_catalog.url_for(
service_type=service_type,
try:
return self._ks.service_catalog.url_for(
service_type=service_type,
- endpoint_type='
internal
URL',
- region_name='
R
egionOne')
+ endpoint_type='
public
URL',
+ region_name='
r
egionOne')
except Exception as exc:
log.warning("Failed to retreive endpoint for service due to: %s",
exc)
except Exception as exc:
log.warning("Failed to retreive endpoint for service due to: %s",
exc)