Merge "Don't rotate keystone fernet keys during deploy"

ansible/roles/keystone/tasks/config.yml

@@ -200,6 +200,7 @@
     - { src: "crontab.j2", dest: "crontab" }
     - { src: "fernet-rotate.sh.j2", dest: "fernet-rotate.sh" }
     - { src: "fernet-node-sync.sh.j2", dest: "fernet-node-sync.sh" }
+    - { src: "fernet-push.sh.j2", dest: "fernet-push.sh" }
     - { src: "id_rsa", dest: "id_rsa" }
     - { src: "ssh_config.j2", dest: "ssh_config" }
   when:

ansible/roles/keystone/tasks/init_fernet.yml

@@ -22,6 +22,6 @@
 
 - name: Run key distribution
   become: true
-  command: docker exec -t keystone_fernet /usr/bin/fernet-rotate.sh
+  command: docker exec -t keystone_fernet /usr/bin/fernet-push.sh
   run_once: True
   delegate_to: "{{ groups['keystone'][0] }}"

ansible/roles/keystone/templates/fernet-push.sh.j2

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+{% for host in groups['keystone'] %}
+{% if inventory_hostname != host %}
+/usr/bin/rsync -az -e 'ssh -i /var/lib/keystone/.ssh/id_rsa -p {{ hostvars[host]['keystone_ssh_port'] }} -F /var/lib/keystone/.ssh/config' --delete /etc/keystone/fernet-keys/ keystone@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:/etc/keystone/fernet-keys
+{% endif %}
+{% endfor %}

ansible/roles/keystone/templates/fernet-rotate.sh.j2

@@ -2,8 +2,4 @@
 
 keystone-manage --config-file /etc/keystone/keystone.conf fernet_rotate --keystone-user {{ keystone_username }} --keystone-group {{ keystone_groupname }}
 
-{% for host in groups['keystone'] %}
-{% if inventory_hostname != host %}
-/usr/bin/rsync -az -e 'ssh -i /var/lib/keystone/.ssh/id_rsa -p {{ hostvars[host]['keystone_ssh_port'] }} -F /var/lib/keystone/.ssh/config' --delete /etc/keystone/fernet-keys/ keystone@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:/etc/keystone/fernet-keys
-{% endif %}
-{% endfor %}
+/usr/bin/fernet-push.sh

ansible/roles/keystone/templates/keystone-fernet.json.j2

@@ -26,6 +26,12 @@
             "owner": "root",
             "perm": "0755"
         },
+        {
+            "source": "{{ container_config_directory }}/fernet-push.sh",
+            "dest": "/usr/bin/fernet-push.sh",
+            "owner": "root",
+            "perm": "0755"
+        },
         {
             "source": "{{ container_config_directory }}/ssh_config",
             "dest": "/var/lib/keystone/.ssh/config",