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>
(cherry picked from commit 941a31e1e7f64f38a487b4e493bc25fdf29657da)

diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index bc2d4ef..b46bbc4 100644 (file)
--- 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