summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-06 18:19:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-06 18:19:12 +0000
commit360e605cda3e6bdeceb06cc0528c1cc0e6e60ed7 (patch)
tree3e54005ec018c0b884a378475e582cae69dd83df /mcp/salt-formulas/opendaylight/server.sls
parentf285667a59e75d2357b0dff27249b4179dbf3d81 (diff)
parentc1889c963bbe9b21645057e6e9cfcbe9c5f6434d (diff)
Merge "Update opendaylight version to oxygen"
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls5
1 files changed, 3 insertions, 2 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index e70931301..069dc2780 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -29,8 +29,8 @@ opendaylight_repo:
# https://github.com/saltstack/salt/pull/45224
# - ppa: {{ server.repo }}
- human_name: opendaylight-ppa
- - name: deb http://ppa.launchpad.net/odl-team/nitrogen/ubuntu xenial main
- - file: /etc/apt/sources.list.d/odl-team-ubuntu-nitrogen-xenial.list
+ - name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main
+ - file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list
opendaylight:
pkg.installed:
@@ -78,6 +78,7 @@ opendaylight:
ini.options_present:
- sections:
org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }}
+ org.osgi.service.http.port: {{ server.odl_rest_port }}
{%- if server.get('router_enabled', false) %}
/opt/opendaylight/etc/custom.properties: