diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-06 18:19:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-06 18:19:12 +0000 |
| commit | 360e605cda3e6bdeceb06cc0528c1cc0e6e60ed7 (patch) | |
| tree | 3e54005ec018c0b884a378475e582cae69dd83df /mcp/salt-formulas/opendaylight/map.jinja | |
| parent | f285667a59e75d2357b0dff27249b4179dbf3d81 (diff) | |
| parent | c1889c963bbe9b21645057e6e9cfcbe9c5f6434d (diff) | |
Merge "Update opendaylight version to oxygen"
Diffstat (limited to 'mcp/salt-formulas/opendaylight/map.jinja')
| -rw-r--r-- | mcp/salt-formulas/opendaylight/map.jinja | 8 |
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')) %} |