Remove duplicate state for apache service.running
We include apache module which already has a state
for apache service management, we don't need to
have duplicate `gnocchi_apache_restart` state
PROD-32488
Change-Id: I0817cea9f2da45adefeaa6fbce6163c0752cca31
diff --git a/gnocchi/server.sls b/gnocchi/server.sls
index c91d668..14f4af8 100644
--- a/gnocchi/server.sls
+++ b/gnocchi/server.sls
@@ -21,17 +21,10 @@
- onlyif: /bin/false
{%- endif %}
- require:
+ - sls: apache.server.site
- sls: gnocchi.backend.upgrade
-
-gnocchi_apache_restart:
- service.running:
- - name: apache2
- - enable: true
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
- - watch:
- - apache_enable_gnocchi_wsgi
+ - watch_in:
+ - service: apache_service
gnocchi_server_services:
service.running: