summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-13 12:54:17 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-13 15:15:34 +0000
commit744d997ccdea187f8217af4cd12e27e2ac5fa3f1 (patch)
treec7d542550bdfe6975689f5e9e615d89cfecd1f4a
parentad10ff601c29960542dae34ce65197c94d2172c0 (diff)
Build in opendaylight service mask
Oxygen has an issue with broken config/data cache caused by service restart in the middle of initial boot. Change-Id: Ia30c76b67566ab8a2fb9045d0e10ca788f1a06a6 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 2d2f59907d578d266e1aa19040314dc15b27c0c6)
-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 069dc2780..51a4d9f95 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -49,6 +49,13 @@ opendaylight:
- ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg
- ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
+# TODO: use service.masked state once salt get updated to 2017.7.0+
+service.mask:
+ module.run:
+ - m_name: opendaylight
+ - require_in:
+ - pkg: opendaylight
+
/opt/opendaylight/etc/jetty.xml:
file.managed:
- source: salt://opendaylight/files/jetty.xml