Commit 7beb364e authored by Simon Redman's avatar Simon Redman

Make not specifying the netinfo.json for the controller an error

parent 33a161dd
......@@ -38,8 +38,6 @@ LOG.setLevel(logging.DEBUG)
DEFAULT_NETJSON_FILE = "./netinfo.json"
class SR_controller(app_manager.RyuApp):
'dpset': dpset.DPSet,
......@@ -79,7 +77,7 @@ class SR_controller(app_manager.RyuApp):
args = cfg.CONF
cfg.StrOpt("net_json", default=DEFAULT_NETJSON_FILE,
cfg.StrOpt("net_json", required=True,
help="Path to NetJSON file to parse for the initial topology"),
cfg.StrOpt("ovs_regex", default=r'^ovs.*',
help="Regex applied to node labels to determine which are slaves to this controller"),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment