summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/map.jinja
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-09 18:48:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-09 18:48:14 +0000
commit20de635a813e0b1ccc37162f00ba4908e8d4663e (patch)
tree90b679f77bd6e92bec553d76b9ad365d7683857c /mcp/salt-formulas/opendaylight/map.jinja
parent2881499fa1eb9fe2d99d17ab82911d579079b567 (diff)
parente3a3c672308953bec50e506f5f9d5ee8a73a0d0e (diff)
Merge "Update opendaylight version to oxygen" into stable/fraser
Diffstat (limited to 'mcp/salt-formulas/opendaylight/map.jinja')
-rw-r--r--mcp/salt-formulas/opendaylight/map.jinja8
1 files changed, 1 insertions, 7 deletions
diff --git a/mcp/salt-formulas/opendaylight/map.jinja b/mcp/salt-formulas/opendaylight/map.jinja
index 9e9df1dc1..38575111e 100644
--- a/mcp/salt-formulas/opendaylight/map.jinja
+++ b/mcp/salt-formulas/opendaylight/map.jinja
@@ -11,7 +11,7 @@
'karaf_features': {'default': ['standard', 'wrap', 'ssh']},
'odl_rest_port': '8282',
'odl_bind_ip': '0.0.0.0',
- 'repo': 'odl-team/nitrogen',
+ 'repo': 'odl-team/oxygen',
'log_levels': {},
'enable_ha': false,
'ha_node_ips': [],
@@ -26,9 +26,3 @@
'repo': 'opendaylight-6-testing'
},
}, merge=salt['pillar.get']('opendaylight:server')) %}
-
-{%- set client = salt['grains.filter_by']({
- 'Debian': {
- 'pkgs': ['python-networking-odl'],
- },
-}, merge=salt['pillar.get']('opendaylight:client')) %}