summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-07 04:42:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-07 04:42:14 +0000
commitf0b176221271f8441424b023edef85036c6d6af8 (patch)
tree40d60efcb6484d01da9a8f6add274aa26cf791ae /mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls
parent0b8c15936be133c6c4aeec36d57329f862f43544 (diff)
parent7fa5e3c80fd05eec425b38c6c2fa5536c9719225 (diff)
Merge "[opendaylight] Support built-in DHCP service"
Diffstat (limited to 'mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls')
-rw-r--r--mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls12
1 files changed, 7 insertions, 5 deletions
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls
index 206dc52a2..ff5a0bbfa 100644
--- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls
+++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls
@@ -46,11 +46,6 @@ opendaylight:
pkg.installed:
- require:
- pkgrepo: opendaylight_repo
- - require_in:
- - 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
{%- if grains['saltversioninfo'] >= [2017, 7] %}
@@ -58,6 +53,7 @@ opendaylight:
{%- endif %}
- watch:
- file: /opt/opendaylight/etc/jetty.xml
+ - file: /opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml
- file: /opt/opendaylight/bin/setenv
- ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg
- ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
@@ -105,6 +101,12 @@ opendaylight:
- service: opendaylight
{%- endif %}
+/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml:
+ file.managed:
+ - source: salt://opendaylight/files/netvirt-dhcpservice-config.xml
+ - use:
+ - file: /opt/opendaylight/etc/jetty.xml
+
{%- if grains['cpuarch'] == 'aarch64' %}
opendaylight-leveldbjni:
pkg.installed