diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-08 12:49:26 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-04 06:59:39 +0000 |
| commit | 8eff52b0d776a278ca031feb35c0bb2bc0ebfebe (patch) | |
| tree | ef93baf0c0b5750180985d1ba4f6720b2c2e4c89 | |
| parent | efec10f8e81336b101a931f0195493d863858302 (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>
(cherry picked from commit 941a31e1e7f64f38a487b4e493bc25fdf29657da)
| -rw-r--r-- | mcp/salt-formulas/opendaylight/server.sls | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index bc2d4efa4..b46bbc463 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 |