Fix require conditions in server sls
* Do not allow to run apache service automatically
PROD-32544
Change-Id: I7da2dac9c62824c6ee0895f3f8c77c904a537a86
diff --git a/barbican/server.sls b/barbican/server.sls
index a420d21..a840e4b 100644
--- a/barbican/server.sls
+++ b/barbican/server.sls
@@ -15,6 +15,8 @@
- contents: |
#!/bin/sh
exit 101
+ - require_in:
+ - pkg: apache_packages
barbican_server_packages:
pkg.installed:
@@ -130,13 +132,13 @@
- template: jinja
- require:
- pkg: barbican_server_packages
- - barbican_cleanup_configs
+ - file: barbican_cleanup_configs
apache_enable_barbican_wsgi:
apache_site.enabled:
- name: barbican-api
- require:
- - barbican_apache_conf_file
+ - file: barbican_apache_conf_file
- watch_in:
- service: apache_service
@@ -155,9 +157,10 @@
- /etc/apache2/sites-available/wsgi_barbican.conf
- /etc/apache2/sites-available/wsgi_barbican_admin.conf
- require:
+ - sls: apache.server.site
- pkg: barbican_server_packages
- - barbican_cleanup_configs
- - barbican_sync_secret_stores
+ - file: barbican_cleanup_configs
+ - cmd: barbican_sync_secret_stores
apache_enable_barbican_wsgi:
apache_site.enabled:
@@ -165,8 +168,8 @@
- wsgi_barbican
- wsgi_barbican_admin
- require:
- - barbican_apache_conf_file
- - barbican_sync_secret_stores
+ - file: barbican_apache_conf_file
+ - cmd: barbican_sync_secret_stores
- watch_in:
- service: apache_service
@@ -182,7 +185,7 @@
- watch:
- file: /etc/barbican/barbican.conf
- require:
- - barbican_sync_secret_stores
+ - cmd: barbican_sync_secret_stores
{%- if server.get('async_queues_enable', False) %}
barbican_async_workers_enable:
@@ -196,7 +199,7 @@
- watch:
- file: /etc/barbican/barbican.conf
- require:
- - barbican_server_services
+ - service: barbican_server_services
{%- else %}
barbican_async_workers_disable:
service.dead: