summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-10-06 12:09:36 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-06 16:08:37 +0000
commit09dfaf22d3ee1867bb05ddbac00adccfeb24913f (patch)
tree72f3bb86ece8110d4646d43c8fc7e48a96f62639 /mcp/salt-formulas/opendaylight/server.sls
parent5c7924bda36eddd3ef8e714ac524458dacc26dcb (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> (cherry picked from commit fca7d22742df82fc6e502b17ad45ebc11c0ba89b)
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls7
1 files changed, 7 insertions, 0 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 8c6c3b28a..f7a97417e 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -14,12 +14,14 @@ opendaylight:
- file: /opt/opendaylight/etc/jetty.xml
- file: /opt/opendaylight/bin/setenv
- ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg
+ - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
service.running:
- enable: true
- watch:
- file: /opt/opendaylight/etc/jetty.xml
- file: /opt/opendaylight/bin/setenv
- ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg
+ - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
/opt/opendaylight/etc/jetty.xml:
file.managed:
@@ -46,6 +48,11 @@ opendaylight:
- sections:
featuresBoot: {{ features }}
+/opt/opendaylight/etc/org.ops4j.pax.web.cfg:
+ ini.options_present:
+ - sections:
+ org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }}
+
{%- if server.get('router_enabled', false) %}
/opt/opendaylight/etc/custom.properties:
ini.options_present: