openstack
/
monasca-api
Code Issues Proposed changes

Register Monasca API in Keystone using SERVICE_HOST 

Change-Id: Id73b2222e7c1e74696bec1c398b55b21bc5b9d24
This commit is contained in:
Roland Hochmuth 2015-11-04 22:47:16 -07:00
parent 475cbf7360
commit 5f4606d176
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/files/keystone/create_monasca_service.py
View File

@ -125,7 +125,7 @@ def add_monasca_service():
return True
def main():
def main(argv):
""" Get token if needed and then call methods to add tenants, users and roles """
users = [{'username': 'mini-mon', 'project': 'mini-mon', 'password': 'password', 'role': 'monasca-user'}, {'username': 'monasca-agent', 'project': 'mini-mon', 'password': 'password', 'role': 'monasca-agent'}]
@ -163,11 +163,14 @@ def main():
if not add_user_roles(key, demo_user):
return 1
if not add_service_endpoint(key, 'monasca', 'Monasca monitoring service', 'monitoring', 'http://127.0.0.1:8070/v2.0', 'RegionOne'):
service_host = argv[0]
monasca_url = 'http://' + service_host + ':8070/v2.0'
if not add_service_endpoint(key, 'monasca', 'Monasca monitoring service', 'monitoring', monasca_url, 'RegionOne'):
return 1
return 0
if __name__ == "__main__":
sys.exit(main())
sys.exit(main(sys.argv[1:]))

6
devstack/plugin.sh
View File

@ -148,7 +148,9 @@ function extra_monasca {
install_monasca_default_alarms
install_monasca_horizon_ui
if is_service_enabled horizon; then
install_monasca_horizon_ui
fi
install_monasca_smoke_test
}
@ -1150,7 +1152,7 @@ function install_monasca_keystone_client {
sudo chmod 0700 /usr/local/bin/create_monasca_service.py
sudo /opt/monasca/bin/python /usr/local/bin/create_monasca_service.py
sudo /opt/monasca/bin/python /usr/local/bin/create_monasca_service.py ${SERVICE_HOST}
}