changes for ansible upgrade 9.1.0 #6209
Conversation
| @@ -33,7 +33,7 @@ | |||
| tags: pghashlib | |||
|
|
|||
| - name: Setup plproxy | |||
| include: plproxy.yml | |||
| include_tasks: plproxy.yml | |||
| when: item.get('host') | |||
| loop: | |||
| - "{{ postgresql_dbs.form_processing.proxy|default({}) }}" | |||
There was a problem hiding this comment.
include_tasks
I've replaced the include statement with include_tasks since it seems that the file plproxy.yml contains tasks.
The loop construct remains unchanged, enabling the task to iterate over the given list.
| when: rabbitmq_version == '3.10.13-1' | ||
|
|
||
| - include: install_old.yml | ||
| - include_tasks: install_old.yml | ||
| when: rabbitmq_version == '3.10.7-1' | ||
|
|
There was a problem hiding this comment.
include_tasks
- I've replaced the include statements with include_tasks since it seems that these files contain tasks.
- Each include task is named for clarity and readability.
- The conditionals (when statements) are kept intact.
| when: rabbitmq_create_cluster|bool | ||
|
|
||
| - include: config.yml | ||
| - include_tasks: config.yml | ||
| when: not rabbitmq_create_cluster or ( ansible_fqdn == hostvars[rabbitmq_cluster_master]['ansible_fqdn'] ) |
There was a problem hiding this comment.
include_tasks
- I've replaced the include statements with include_tasks since it seems that these files contain tasks.
- Each include task is named for clarity and readability.
- The conditionals (when statements) are kept intact.
| when: (rabbitmq_create_cluster | bool) and ( ansible_fqdn != hostvars[rabbitmq_cluster_master]['ansible_fqdn'] ) | ||
|
|
||
| - include: ha-policy.yml | ||
| - include_tasks: ha-policy.yml | ||
| when: (rabbitmq_create_cluster| bool ) and ( ansible_fqdn == hostvars[rabbitmq_cluster_master]['ansible_fqdn'] ) |
There was a problem hiding this comment.
include_tasks
- I've replaced the include statements with include_tasks since it seems that these files contain tasks.
- Each include task is named for clarity and readability.
- The conditionals (when statements) are kept intact.
| @@ -1,6 +1,6 @@ | |||
| --- | |||
|
|
|||
| - include: setup_cluster.yml | |||
| - include_tasks: setup_cluster.yml | |||
| when: is_redis_cluster|bool and inventory_hostname in groups['redis_cluster_master'] | |||
|
|
|||
There was a problem hiding this comment.
include_tasks
- I've replaced the include statement with include_tasks since it seems that the file setup_cluster.yml contains tasks.
- The condition (when statement) is kept intact.
| when: elasticsearch_version == '5.6.16' | ||
|
|
||
| - include: misc_v7.yml | ||
| - include_tasks: misc_v7.yml | ||
| when: elasticsearch_version is version('7.0.0', '>=') |
There was a problem hiding this comment.
include_tasks:
- I've replaced the include statements with include_tasks since it seems that these files contain tasks.
- Each include task is named for clarity and readability.
- The conditionals (when statements) are kept intact.
There was a problem hiding this comment.
It's not totally clear whether include_tasks or import_tasks is the best replacement. The deprecated include docs aren't super clear on how to know which to use. I think include_tasks (which is dynamic) will work here and may even be required in situations where a when condition is applied to the include.
To summarize, this looks fine unless Ansible doesn't like it for some reason.
| @@ -141,7 +141,7 @@ | |||
| - name: check users password valid time | |||
| shell: getent shadow "{{ item }}" | cut -d':' -f5 | |||
| register: users_pw_valid | |||
| loop: "{{ dev_users.present }} + ['ansible', '{{ cchq_user }}']" | |||
| loop: "{{ ['ubuntu'] + ['ansible', cchq_user] }}" | |||
| changed_when: False | |||
There was a problem hiding this comment.
change this to loop: "{{ ['dev_users.present'] + ['ansible', cchq_user] }}"
| @@ -141,7 +141,7 @@ | |||
| - name: check users password valid time | |||
| shell: getent shadow "{{ item }}" | cut -d':' -f5 | |||
| register: users_pw_valid | |||
| loop: "{{ dev_users.present }} + ['ansible', '{{ cchq_user }}']" | |||
| loop: "{{ ['ubuntu'] + ['ansible', cchq_user] }}" | |||
There was a problem hiding this comment.
This doesn't look like it does what it did before. Would this work instead?
| loop: "{{ ['ubuntu'] + ['ansible', cchq_user] }}" | |
| loop: "{{ dev_users.present + ['ansible', cchq_user] }}" |
| when: elasticsearch_version == '5.6.16' | ||
|
|
||
| - include: misc_v7.yml | ||
| - include_tasks: misc_v7.yml | ||
| when: elasticsearch_version is version('7.0.0', '>=') |
There was a problem hiding this comment.
It's not totally clear whether include_tasks or import_tasks is the best replacement. The deprecated include docs aren't super clear on how to know which to use. I think include_tasks (which is dynamic) will work here and may even be required in situations where a when condition is applied to the include.
To summarize, this looks fine unless Ansible doesn't like it for some reason.
Staging, India and Production
https://dimagi-dev.atlassian.net/browse/SAAS-14998