Update opendaylight version to nitrogen

[fuel.git] / mcp / salt-formulas / opendaylight / server.sls

diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index cb5b312..f7a9741 100644 (file)
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -13,13 +13,15 @@ opendaylight:
   - require_in:
     - file: /opt/opendaylight/etc/jetty.xml
     - file: /opt/opendaylight/bin/setenv
-    - file: /opt/opendaylight/etc/org.apache.karaf.features.cfg
+    - 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
-    - file: /opt/opendaylight/etc/org.apache.karaf.features.cfg
+    - 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:
@@ -42,8 +44,25 @@ opendaylight:
 {% endset %}
 
 /opt/opendaylight/etc/org.apache.karaf.features.cfg:
-  file.replace:
-  - pattern: ^featuresBoot=.*$
-  - repl: "featuresBoot={{ features }}"
+  ini.options_present:
+    - 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:
+    - sections:
+        ovsdb.l3.fwd.enabled: 'yes'
+        ovsdb.of.version: 1.3
+    - require:
+      - pkg: opendaylight
+    - watch_in:
+      - service: opendaylight
+{%- endif %}
 
 {%- endif %}