Merge "Require missing dhcp-agent package"
diff --git a/neutron/compute.sls b/neutron/compute.sls
index 933680f..b7d802c 100644
--- a/neutron/compute.sls
+++ b/neutron/compute.sls
@@ -88,19 +88,17 @@
- neutron.fwaas
{%- endif %}
-{%- if not grains.get('noservices', False) %}
+{%- if not grains.get('noservices', False) and pillar.haproxy is not defined %}
# NOTE(mpolenchuk): haproxy is used as a replacement for
# neutron-ns-metadata-proxy Python implementation starting from Pike
haproxy:
- {%- if grains['saltversioninfo'] < [2017,7] %}
- module.run:
- - name: service.mask
- - m_name: haproxy
- {%- else %}
- service.masked:
- {%- endif %}
- - prereq:
+ service.dead:
+ - enable: False
+ - require:
- pkg: neutron_dvr_packages
+{%- if compute.get('dhcp_agent_enabled', False) %}
+ - pkg: neutron_dhcp_agent_packages
+{%- endif %}
{%- endif %}
neutron_dvr_packages: