summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/map.jinja
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-06 12:09:36 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-06 17:40:00 +0400
commitfca7d22742df82fc6e502b17ad45ebc11c0ba89b (patch)
tree72f3bb86ece8110d4646d43c8fc7e48a96f62639 /mcp/salt-formulas/opendaylight/map.jinja
parent2d95dee51177e66f5370b85115c2999925b13657 (diff)
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 <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas/opendaylight/map.jinja')
-rw-r--r--mcp/salt-formulas/opendaylight/map.jinja4
1 files changed, 2 insertions, 2 deletions
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': [],