aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-14 11:11:32 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-31 11:11:32 +0400
commitdf50704b226a11f6ce9d0a46b178a5b8e8cd0284 (patch)
tree11f13697a96c54ed28c9ba18fa716be183bd84bd /mcp/salt-formulas/opendaylight
parent6b62f74000cd41fab84817bf119c33dbe44f91a4 (diff)
Bring in opendaylight L3/router scenario
Change-Id: I8a3be1764de136e2ecf81f964233483be5d6655a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas/opendaylight')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls22
1 files changed, 17 insertions, 5 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index cb5b3120c..8c6c3b28a 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -13,13 +13,13 @@ 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
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
/opt/opendaylight/etc/jetty.xml:
file.managed:
@@ -42,8 +42,20 @@ opendaylight:
{% endset %}
/opt/opendaylight/etc/org.apache.karaf.features.cfg:
- file.replace:
- - pattern: ^featuresBoot=.*$
- - repl: "featuresBoot={{ features }}"
+ ini.options_present:
+ - sections:
+ featuresBoot: {{ features }}
+
+{%- 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 %}