From 56eadbfa76c9f5697712731db7d20eb64281b93d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 22 Feb 2019 02:07:27 +0000 Subject: [PATCH] Set the user argument in the cron module This change sets the user argument in the cron module which is required in future versions of ansible when the cron_file argument is also used. Filter deprecations for skipped items have also been fixed. Change-Id: I803cd3c62707880e873662ea86590274b2766d21 Signed-off-by: Kevin Carter --- tasks/keystone_credential_autorotate.yml | 1 + tasks/keystone_credential_create.yml | 8 ++++---- tasks/keystone_fernet_keys_autorotate.yml | 1 + tasks/keystone_install_source.yml | 1 - tasks/keystone_uwsgi.yml | 1 - 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/keystone_credential_autorotate.yml b/tasks/keystone_credential_autorotate.yml index 6e1895cb..184431a5 100644 --- a/tasks/keystone_credential_autorotate.yml +++ b/tasks/keystone_credential_autorotate.yml @@ -41,6 +41,7 @@ - name: Remove extra auto rotation job cron: name: "Credential auto rotate job" + user: "{{ keystone_system_user_name }}" cron_file: keystone-credential-rotate state: "absent" when: > diff --git a/tasks/keystone_credential_create.yml b/tasks/keystone_credential_create.yml index ae684880..5001ced8 100644 --- a/tasks/keystone_credential_create.yml +++ b/tasks/keystone_credential_create.yml @@ -57,7 +57,7 @@ owner: "{{ keystone_system_user_name }}" group: "{{ keystone_system_group_name }}" mode: "0700" - when: not collected_existing_credential_keys | skipped + when: not collected_existing_credential_keys is skipped - name: Drop the existing credential keys in the master Keystone container copy: @@ -66,7 +66,7 @@ owner: "{{ keystone_system_user_name }}" group: "{{ keystone_system_group_name }}" mode: "0600" - when: not collected_existing_credential_keys | skipped + when: not collected_existing_credential_keys is skipped register: drop_existing_credential_keys with_indexed_items: "{{ collected_existing_credential_keys.results | map(attribute='content') | list | unique }}" @@ -89,7 +89,7 @@ --keystone-group "{{ keystone_system_group_name }}" become: yes become_user: "{{ keystone_system_user_name }}" - when: create_credential_keys | skipped + when: create_credential_keys is skipped - name: Rotate credential keys for Keystone command: > @@ -98,4 +98,4 @@ --keystone-group "{{ keystone_system_group_name }}" become: yes become_user: "{{ keystone_system_user_name }}" - when: create_credential_keys | skipped + when: create_credential_keys is skipped diff --git a/tasks/keystone_fernet_keys_autorotate.yml b/tasks/keystone_fernet_keys_autorotate.yml index 67dc741c..855bc6b5 100644 --- a/tasks/keystone_fernet_keys_autorotate.yml +++ b/tasks/keystone_fernet_keys_autorotate.yml @@ -41,6 +41,7 @@ - name: Remove extra auto rotation job cron: name: "Fernet auto rotate job" + user: "{{ keystone_system_user_name }}" cron_file: keystone-fernet-rotate state: "absent" when: > diff --git a/tasks/keystone_install_source.yml b/tasks/keystone_install_source.yml index 53c573ba..5f6f091e 100644 --- a/tasks/keystone_install_source.yml +++ b/tasks/keystone_install_source.yml @@ -37,7 +37,6 @@ - name: Install the python venv include_role: name: "python_venv_build" - private: yes vars: venv_build_distro_package_list: "{{ keystone_devel_distro_packages }}" venv_install_destination_path: "{{ keystone_bin | dirname }}" diff --git a/tasks/keystone_uwsgi.yml b/tasks/keystone_uwsgi.yml index 7435d561..02480dbb 100644 --- a/tasks/keystone_uwsgi.yml +++ b/tasks/keystone_uwsgi.yml @@ -34,7 +34,6 @@ - name: Run the systemd service role include_role: name: systemd_service - private: true vars: systemd_user_name: "{{ keystone_system_user_name }}" systemd_group_name: "{{ keystone_system_group_name }}"