From 09dfaf22d3ee1867bb05ddbac00adccfeb24913f Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 6 Oct 2017 12:09:36 +0400 Subject: Update opendaylight version to nitrogen * use pseudo agentdb port binding controller instead of the deprecated network topology one * disable superfluous l2population mechanism driver * tidy up the duplicated haproxy neutron listen opts * straighten karaf features list * update jetty config Change-Id: Ifacf8de11eb56ab72df13a312151a510b280dea2 Signed-off-by: Michael Polenchuk (cherry picked from commit fca7d22742df82fc6e502b17ad45ebc11c0ba89b) --- mcp/salt-formulas/opendaylight/map.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/salt-formulas/opendaylight/map.jinja') diff --git a/mcp/salt-formulas/opendaylight/map.jinja b/mcp/salt-formulas/opendaylight/map.jinja index 0f6bf3c7e..755f878e2 100644 --- a/mcp/salt-formulas/opendaylight/map.jinja +++ b/mcp/salt-formulas/opendaylight/map.jinja @@ -1,10 +1,10 @@ {% set server = salt['grains.filter_by']({ 'Debian': { - 'karaf_features': {'default': ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management']}, + 'karaf_features': {'default': ['standard', 'wrap', 'ssh']}, 'odl_rest_port': '8282', 'odl_bind_ip': '0.0.0.0', - 'repo': 'odl-team/carbon', + 'repo': 'odl-team/nitrogen', 'log_levels': {}, 'enable_ha': false, 'ha_node_ips': [], -- cgit 1.2.3-korg