Fixup niggles in review feedback
This commit is contained in:
parent
ad3ce251b5
commit
083f482442
|
@ -37,8 +37,8 @@ config = config()
|
||||||
@hooks.hook("config-changed")
|
@hooks.hook("config-changed")
|
||||||
@restart_on_change({"/home/opendaylight/.m2/settings.xml": ["odl-controller"]})
|
@restart_on_change({"/home/opendaylight/.m2/settings.xml": ["odl-controller"]})
|
||||||
def config_changed():
|
def config_changed():
|
||||||
process_odl_cmds(PROFILES[config['profile']])
|
process_odl_cmds(PROFILES[config["profile"]])
|
||||||
for r_id in relation_ids('controller-api'):
|
for r_id in relation_ids("controller-api"):
|
||||||
controller_api_joined(r_id)
|
controller_api_joined(r_id)
|
||||||
write_mvn_config()
|
write_mvn_config()
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ def config_changed():
|
||||||
@hooks.hook("controller-api-relation-joined")
|
@hooks.hook("controller-api-relation-joined")
|
||||||
def controller_api_joined(r_id=None):
|
def controller_api_joined(r_id=None):
|
||||||
relation_set(relation_id=r_id,
|
relation_set(relation_id=r_id,
|
||||||
port=PROFILES[config['profile']]['port'],
|
port=PROFILES[config["profile"]]["port"],
|
||||||
username="admin", password="admin")
|
username="admin", password="admin")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,27 +7,27 @@ from charmhelpers.core.hookenv import config
|
||||||
|
|
||||||
|
|
||||||
PROFILES = {
|
PROFILES = {
|
||||||
'cisco-vpp': {
|
"cisco-vpp": {
|
||||||
'feature:install': ['cosc-cvpn-ovs-rest',
|
"feature:install": ["cosc-cvpn-ovs-rest",
|
||||||
'odl-netconf-connector-all'],
|
"odl-netconf-connector-all"],
|
||||||
'log:set': {
|
"log:set": {
|
||||||
'TRACE': ['cosc-cvpn-ovs-rest',
|
"TRACE": ["cosc-cvpn-ovs-rest",
|
||||||
'odl-netconf-connector-all'],
|
"odl-netconf-connector-all"],
|
||||||
},
|
},
|
||||||
'port': 8181
|
"port": 8181
|
||||||
},
|
},
|
||||||
'openvswitch-odl': {
|
"openvswitch-odl": {
|
||||||
'feature:install': ["odl-base-all", "odl-aaa-authn",
|
"feature:install": ["odl-base-all", "odl-aaa-authn",
|
||||||
"odl-restconf", "odl-nsf-all",
|
"odl-restconf", "odl-nsf-all",
|
||||||
"odl-adsal-northbound",
|
"odl-adsal-northbound",
|
||||||
"odl-mdsal-apidocs",
|
"odl-mdsal-apidocs",
|
||||||
"odl-ovsdb-openstack",
|
"odl-ovsdb-openstack",
|
||||||
"odl-ovsdb-northbound",
|
"odl-ovsdb-northbound",
|
||||||
"odl-dlux-core"],
|
"odl-dlux-core"],
|
||||||
'port': 8080
|
"port": 8080
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PROFILES['default'] = PROFILES['openvswitch-odl']
|
PROFILES["default"] = PROFILES["openvswitch-odl"]
|
||||||
|
|
||||||
|
|
||||||
def mvn_ctx():
|
def mvn_ctx():
|
||||||
|
@ -39,7 +39,7 @@ def mvn_ctx():
|
||||||
|
|
||||||
def mvn_proxy_ctx(protocol):
|
def mvn_proxy_ctx(protocol):
|
||||||
ctx = {}
|
ctx = {}
|
||||||
proxy = config('%s-proxy' % protocol)
|
proxy = config("{}-proxy".format(protocol))
|
||||||
key = protocol + "_proxy"
|
key = protocol + "_proxy"
|
||||||
if proxy:
|
if proxy:
|
||||||
url = urlparse.urlparse(proxy)
|
url = urlparse.urlparse(proxy)
|
||||||
|
|
Loading…
Reference in New Issue