commit a4428895d5cb26a488bceb3cf76b3f7d2d9b7504
author Vasyl Saienko <vsaienko@mirantis.com> Thu Sep 06 13:01:00 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Thu Sep 06 13:01:08 2018 +0300
tree 721317e5f76e494a051a6a1cb509d91ecf5c32de
parent 99a2742f4d45148b5bb30ee9f2a0fc7a66fe598e

Fix ordering for _ssl/mysql tasks

Change-Id: Id5e77e69fc5b48a21b988fb70ff982c737931219

keystone/_ssl/mysql.sls

diff --git a/keystone/_ssl/mysql.sls b/keystone/_ssl/mysql.sls
index a2b93a9..2fa0f0a 100644
--- a/keystone/_ssl/mysql.sls
+++ b/keystone/_ssl/mysql.sls
@@ -1,5 +1,9 @@
 {%- from "keystone/map.jinja" import server with context %}
 
+keystone_ssl_mysql:
+  test.show_notification:
+    - text: "Running keystone._ssl.mysql"
+
 {%- if server.database.get('x509',{}).get('enabled',False) %}
 
   {%- set ca_file=server.database.x509.ca_file %}
@@ -55,4 +59,4 @@
     - name: {{ server.database.ssl.get('cacert_file', server.cacert_file) }}
   {%- endif %}
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}

keystone/server.sls

diff --git a/keystone/server.sls b/keystone/server.sls
index 1d691e3..cd6be76 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -9,17 +9,15 @@
   - apache
   {%- endif %}
   - keystone.db.offline_sync
-  {%- if mysql_x509_ssl_enabled %}
   - keystone._ssl.mysql
-  {%- endif %}
 
 keystone_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
   - require_in:
     - sls: keystone.db.offline_sync
+    - sls: keystone._ssl.mysql
   {%- if server.service_name in ['apache2', 'httpd'] %}
-  - require_in:
     - pkg: apache_packages
   {%- endif %}
 
@@ -104,9 +102,9 @@
   - group: keystone
   - require:
     - pkg: keystone_packages
-    {%- if mysql_x509_ssl_enabled %}
     - sls: keystone._ssl.mysql
-    {%- endif %}
+  - require_in:
+    - sls: keystone.db.offline_sync
   - watch_in:
     - service: {{ keystone_service }}
 
@@ -133,6 +131,9 @@
   - template: jinja
   - require:
     - pkg: keystone_packages
+    - sls: keystone._ssl.mysql
+  - require_in:
+    - sls: keystone.db.offline_sync
   - watch_in:
     - service: {{ keystone_service }}
 
@@ -158,6 +159,7 @@
       - sls: keystone.db.offline_sync
     - require:
       - pkg: keystone_packages
+      - sls: keystone._ssl.mysql
 {%- if server.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
       - pkg: keystone_fluentd_logger_package
 {%- endif %}