aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-08 12:49:26 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-08 16:05:44 +0400
commit941a31e1e7f64f38a487b4e493bc25fdf29657da (patch)
tree7ead27d87eeacdedfc18aad068d588cb853a3104 /mcp
parentbf341b7e0d7e423044827f379e4b180e9dc897a1 (diff)
Unmask OpenDaylight service explicitly
After salt update to version 2017.7.0 the indefinite mask has to be removed before attempting to start the service. Change-Id: I21616929f06f8ebd8a2d70e8c33f92c7b808a9c5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls12
1 files changed, 5 insertions, 7 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index 453d244c9..edacc7855 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -32,6 +32,10 @@ opendaylight_repo:
- name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main
- file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list
+opendaylight_service_mask:
+ service.masked:
+ - name: opendaylight
+
opendaylight:
pkg.installed:
- require:
@@ -43,19 +47,13 @@ opendaylight:
- ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
service.running:
- enable: true
+ - unmask: 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
-# 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