diff --git a/requirements.txt b/requirements.txt index 78536f31e0..76602d9c89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,11 @@ # # pip-compile --output-file=requirements.txt setup.py # -ansible==4.10.0 +ansible==9.2.0 # via # ansible-vault # commcare-cloud (setup.py) -ansible-core==2.11.12 +ansible-core==2.16.3 # via ansible ansible-inventory==0.6.4 # via commcare-cloud (setup.py) diff --git a/setup.py b/setup.py index 855fc8ace0..0de6647b35 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ install_deps = [ 'ansible-vault==2.1.0', - 'ansible~=4.3', + 'ansible~=9.2.0', 'ansible-inventory==0.6.4', 'argparse>=1.4', 'attrs>=18.1.0', diff --git a/src/commcare_cloud/ansible/deploy_citusdb.yml b/src/commcare_cloud/ansible/deploy_citusdb.yml index 9aeac7c839..7512a6150a 100644 --- a/src/commcare_cloud/ansible/deploy_citusdb.yml +++ b/src/commcare_cloud/ansible/deploy_citusdb.yml @@ -14,7 +14,7 @@ - name: Encrypt drive vars: dir_path: "{{ postgresql_archive_path }}" - include: encrypt_dir.yml + include_tasks: encrypt_dir.yml when: postgresql_archive_path is defined tags: ecryptfs diff --git a/src/commcare_cloud/ansible/deploy_formplayer.yml b/src/commcare_cloud/ansible/deploy_formplayer.yml index ebfda9fda5..c73245ec1e 100644 --- a/src/commcare_cloud/ansible/deploy_formplayer.yml +++ b/src/commcare_cloud/ansible/deploy_formplayer.yml @@ -37,4 +37,4 @@ - role: kinesis_agent tags: kinesis-agent handlers: - - include: roles/monit/handlers/main.yml + - include_tasks: roles/monit/handlers/main.yml diff --git a/src/commcare_cloud/ansible/deploy_postgres.yml b/src/commcare_cloud/ansible/deploy_postgres.yml index fc913f918a..a1209d7200 100644 --- a/src/commcare_cloud/ansible/deploy_postgres.yml +++ b/src/commcare_cloud/ansible/deploy_postgres.yml @@ -14,7 +14,7 @@ - name: Encrypt drive vars: dir_path: "{{ postgresql_archive_path }}" - include: encrypt_dir.yml + include_tasks: encrypt_dir.yml when: postgresql_archive_path is defined tags: ecryptfs diff --git a/src/commcare_cloud/ansible/roles/bootstrap-users/tasks/main.yml b/src/commcare_cloud/ansible/roles/bootstrap-users/tasks/main.yml index f32fbfd2d6..35147a0944 100644 --- a/src/commcare_cloud/ansible/roles/bootstrap-users/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/bootstrap-users/tasks/main.yml @@ -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: "{{ dev_users.present + ['ansible', cchq_user] }}" changed_when: False - name: clear users password valid time diff --git a/src/commcare_cloud/ansible/roles/elasticsearch/tasks/main.yml b/src/commcare_cloud/ansible/roles/elasticsearch/tasks/main.yml index a02fa8bbd8..ba65bc8fb5 100644 --- a/src/commcare_cloud/ansible/roles/elasticsearch/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/elasticsearch/tasks/main.yml @@ -83,13 +83,13 @@ tags: - es_conf -- include: misc_v2.yml +- include_tasks: misc_v2.yml when: elasticsearch_version == '2.4.6' -- include: misc_v5.yml +- include_tasks: misc_v5.yml when: elasticsearch_version == '5.6.16' -- include: misc_v7.yml +- include_tasks: misc_v7.yml when: elasticsearch_version is version('7.0.0', '>=') - name: Copy Elasticsearch Systemd Conf diff --git a/src/commcare_cloud/ansible/roles/lpar2rrd/tasks/main.yml b/src/commcare_cloud/ansible/roles/lpar2rrd/tasks/main.yml index ea318151bc..33f9f8c3ce 100644 --- a/src/commcare_cloud/ansible/roles/lpar2rrd/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/lpar2rrd/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: install_agent.yml +- include_tasks: install_agent.yml tags: lpar2rrd_agent -- include: install_master.yml +- include_tasks: install_master.yml when: inventory_hostname in groups.lpar2rrd_master|default([]) tags: lpar2rrd_master diff --git a/src/commcare_cloud/ansible/roles/postgresql/tasks/main.yml b/src/commcare_cloud/ansible/roles/postgresql/tasks/main.yml index 32bf16590f..467a0a7578 100644 --- a/src/commcare_cloud/ansible/roles/postgresql/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/postgresql/tasks/main.yml @@ -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({}) }}" diff --git a/src/commcare_cloud/ansible/roles/rabbitmq/tasks/main.yml b/src/commcare_cloud/ansible/roles/rabbitmq/tasks/main.yml index d9c1ee68ae..f6ca7e3533 100644 --- a/src/commcare_cloud/ansible/roles/rabbitmq/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/rabbitmq/tasks/main.yml @@ -1,8 +1,8 @@ --- -- include: install_latest.yml +- include_tasks: install_latest.yml when: rabbitmq_version == '3.10.13-1' -- include: install_old.yml +- include_tasks: install_old.yml when: rabbitmq_version == '3.10.7-1' - name: Place config file @@ -40,10 +40,10 @@ become: yes service: name=rabbitmq-server state=started -- include: config-cluster.yml +- include_tasks: config-cluster.yml 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'] ) - name: Enable and start RabbitMQ service @@ -51,8 +51,8 @@ service: name=rabbitmq-server state=started tags: after-reboot -- include: join-cluster.yml +- include_tasks: join-cluster.yml 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'] ) diff --git a/src/commcare_cloud/ansible/roles/redis/tasks/main.yml b/src/commcare_cloud/ansible/roles/redis/tasks/main.yml index 76f8d0416b..a27bf5e13b 100644 --- a/src/commcare_cloud/ansible/roles/redis/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/redis/tasks/main.yml @@ -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'] - name: start the redis service diff --git a/src/commcare_cloud/ansible/roles/sentry/tasks/main.yml b/src/commcare_cloud/ansible/roles/sentry/tasks/main.yml index 6fc4bd3645..fd9850c008 100644 --- a/src/commcare_cloud/ansible/roles/sentry/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/sentry/tasks/main.yml @@ -1,7 +1,7 @@ --- -- include: sentry.yml +- include_tasks: sentry.yml tags: sentry -- include: clickhouse.yml +- include_tasks: clickhouse.yml tags: clickhouse -- include: snuba.yml - tags: snuba \ No newline at end of file +- include_tasks: snuba.yml + tags: snuba