Make sure apache state do not fail when apache pillar defined
Add default enabled:false flag to server:service.
Do not remove apache when not enabled.
Change-Id: Id5c4159dd80ae3cfdbc7c0f4a7f313b335049870
diff --git a/apache/map.jinja b/apache/map.jinja
index c53253f..a6f62c5 100644
--- a/apache/map.jinja
+++ b/apache/map.jinja
@@ -20,6 +20,7 @@
'start_period': '1',
'end_period': '3600',
},
+ 'enabled': false
},
'Arch': {
'pkgs': ['apache', 'openssl'],
@@ -34,6 +35,7 @@
'www_dir': '/var/www',
'service_user': 'apache',
'service_group': 'apache',
+ 'enabled': false
},
'RedHat': {
'pkgs': ['httpd', 'openssl'],
@@ -47,6 +49,7 @@
'www_dir': '/var/www',
'service_user': 'apache',
'service_group': 'apache',
+ 'enabled': false
},
'FreeBSD': {
'pkgs': ['apache22', 'openssl'],
@@ -60,6 +63,7 @@
'www_dir': '/usr/local/www/apache22/',
'service_user': 'apache',
'service_group': 'apache',
+ 'enabled': false
},
}, merge=salt['grains.filter_by']({
'trusty': {
@@ -83,6 +87,7 @@
'start_period': '1',
'end_period': '3600',
},
+ 'enabled': false
},
'xenial': {
'pkgs': ['apache2', 'openssl'],
@@ -105,6 +110,7 @@
'start_period': '1',
'end_period': '3600',
},
+ 'enabled': false
},
}, grain='oscodename', merge=salt['pillar.get']('apache:server'))) %}
diff --git a/apache/server/service/init.sls b/apache/server/service/init.sls
index 80ad43f..ae634d1 100644
--- a/apache/server/service/init.sls
+++ b/apache/server/service/init.sls
@@ -1,5 +1,9 @@
{%- from "apache/map.jinja" import server with context %}
+apache_server_service_task:
+ test.show_notification:
+ - text: "Running apache.server.service"
+
{%- if server.enabled %}
include:
@@ -85,19 +89,4 @@
- require:
- pkg: apache_packages
-{%- else %}
-
-apache_service_dead:
- service.dead:
- - name: {{ server.service }}
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
-
-apache_remove_packages:
- pkg.purged:
- - pkgs: {{ server.pkgs }}
- - require:
- - service: apache_service_dead
-
{%- endif %}