Merge "Unmask l2gw agent service explicitly"
diff --git a/neutron/agents/_l2gw.sls b/neutron/agents/_l2gw.sls
index 53e048a..9f565a9 100644
--- a/neutron/agents/_l2gw.sls
+++ b/neutron/agents/_l2gw.sls
@@ -14,16 +14,24 @@
{%- if not grains.get('noservices', False) %}
-# TODO: use service.masked state instead once salt get updated to 2017.7.0+
+{%- if grains['saltversioninfo'] < [2017, 7] %}
service.mask:
module.run:
- m_name: neutron-l2gateway-agent
+{%- else %}
+l2gw_agent__service_mask:
+ service.masked:
+ - name: neutron-l2gateway-agent
+{%- endif %}
- require_in:
- pkg: l2gw_agent_packages
neutron-l2gateway-agent:
service.running:
- enable: true
+{%- if grains['saltversioninfo'] >= [2017, 7] %}
+ - unmask: true
+{%- endif %}
- watch:
- file: /etc/neutron/l2gateway_agent.ini
- file: /etc/neutron/neutron.conf