diff --git a/neutron/compute.sls b/neutron/compute.sls
index 0dc1344..2eefb6a 100644
--- a/neutron/compute.sls
+++ b/neutron/compute.sls
@@ -88,6 +88,21 @@
 - neutron.fwaas
 {%- endif %}
 
+{%- if not grains.get('noservices', False) %}
+# 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:
+    - pkg: neutron_dvr_packages
+{%- endif %}
+
 neutron_dvr_packages:
   pkg.installed:
   - names:
diff --git a/neutron/gateway.sls b/neutron/gateway.sls
index 9c884ce..1d2170e 100644
--- a/neutron/gateway.sls
+++ b/neutron/gateway.sls
@@ -10,6 +10,21 @@
   pkg.installed:
   - names: {{ gateway.pkgs }}
 
+{%- if not grains.get('noservices', False) %}
+# 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:
+    - pkg: neutron_gateway_packages
+{%- endif %}
+
 {%- if pillar.neutron.server is not defined %}
 
 /etc/neutron/neutron.conf: