summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/server.sls
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-14 21:45:29 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-14 21:55:06 +0400
commit06c464a9c2aee9cbfa801b2f3842bd0beca62291 (patch)
tree8b8487f2bd8b9067eafc5167c9c03b87d10d33c0 /mcp/salt-formulas/opendaylight/server.sls
parentfd1f3fa1c8c83b2e5f8cacc6a6caf1a14e40b1a5 (diff)
Get back to salt 2016.11
Change-Id: Id024ed22dd1760f41ae18aeb8e680c2f07a5dc63 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas/opendaylight/server.sls')
-rw-r--r--mcp/salt-formulas/opendaylight/server.sls8
1 files changed, 8 insertions, 0 deletions
diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index edacc7855..5f53e6a18 100644
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -32,9 +32,15 @@ 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
+{%- if grains['saltversioninfo'] < [2017, 7] %}
+service.mask:
+ module.run:
+ - m_name: opendaylight
+{%- else %}
opendaylight_service_mask:
service.masked:
- name: opendaylight
+{%- endif %}
opendaylight:
pkg.installed:
@@ -47,7 +53,9 @@ opendaylight:
- ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
service.running:
- enable: true
+{%- if grains['saltversioninfo'] >= [2017, 7] %}
- unmask: true
+{%- endif %}
- watch:
- file: /opt/opendaylight/etc/jetty.xml
- file: /opt/opendaylight/bin/setenv