summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
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/server.sls
parent2881499fa1eb9fe2d99d17ab82911d579079b567 (diff)
parente3a3c672308953bec50e506f5f9d5ee8a73a0d0e (diff)
Merge "Update opendaylight version to oxygen" into stable/fraser
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: