commit 27200ffb5e233a0bbc53f23f2c27afad8959d8a4
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Sep 04 23:21:00 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Tue Sep 04 23:21:00 2018 +0000
tree 0c28f10245bd61b7ab339c2456ce7316f264aa27
parent 6e7e066a9dea99b36a2424899e542219e492f7b7
parent 10773761e0aa1fed4bbec9128807063f2c631829

Merge "Adding states to perform designate upgrade"

designate/server.sls

diff --git a/designate/server.sls b/designate/server.sls
index fed7379..2f56638 100644
--- a/designate/server.sls
+++ b/designate/server.sls
@@ -19,6 +19,8 @@
   file.managed:
     - source: salt://designate/files/rndc.key
     - template: jinja
+    - mode: 0640
+    - group: designate
     - require:
       - pkg: designate_server_packages
 
@@ -56,11 +58,14 @@
     - name: /etc/designate/logging.conf
     - source: salt://oslo_templates/files/logging/_logging.conf
     - template: jinja
-    - user: designate
+    - mode: 0640
+    - user: root
     - group: designate
     - defaults:
         service_name: designate
         _data: {{ server.logging }}
+    - require_in:
+      - sls: designate.db.offline_sync
     - require:
       - pkg: designate_server_packages
 {%- if server.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
@@ -83,7 +88,8 @@
     - source: salt://oslo_templates/files/logging/_logging.conf
     - template: jinja
     - makedirs: True
-    - user: designate
+    - mode: 0640
+    - user: root
     - group: designate
     - defaults:
         service_name: {{ service_name }}
@@ -108,6 +114,8 @@
   file.managed:
   - source: salt://designate/files/{{ server.version }}/designate.conf.{{ grains.os_family }}
   - template: jinja
+  - mode: 0640
+  - group: designate
   - require:
     - pkg: designate_server_packages
   - require_in:
@@ -117,6 +125,8 @@
   file.managed:
   - source: salt://designate/files/{{ server.version }}/api-paste.ini
   - template: jinja
+  - mode: 0640
+  - group: designate
   - require:
     - pkg: designate_server_packages
   - require_in:
@@ -156,6 +166,8 @@
   file.managed:
   - source: salt://designate/files/{{ server.version }}/pools.yaml
   - template: jinja
+  - mode: 0640
+  - group: designate
   - require:
     - pkg: designate_server_packages
 

designate/worker.sls

diff --git a/designate/worker.sls b/designate/worker.sls
index fb3f91c..b1f52b6 100644
--- a/designate/worker.sls
+++ b/designate/worker.sls
@@ -42,7 +42,8 @@
     - source: salt://oslo_templates/files/logging/_logging.conf
     - template: jinja
     - makedirs: True
-    - user: designate
+    - mode: 0640
+    - user: root
     - group: designate
     - defaults:
         service_name: {{ service_name }}