Skip to content

Commit e25f505

Browse files
tymofiisobchenkodrazenCEmatej5Matej Stajduhargregharvey
authored
Pin ansible version pr devel 2.x (#2675)
* Fixing-email-title-for-backup-validation (#2657) Co-authored-by: Matej Stajduhar <[email protected]> * Adding-task-to-create-aurora-cluster (#2659) * Adding-task-to-create-aurora-cluster * Adding-region-profile-and-tags-to-aurora-cluster * Updating-engine-for-aurora-cluster * Updating-parameter-group-engine * Updating-engine-version * Updating-engine-version-2 * Disabling-automated-backups * Disabling-automated-backups-2 * Disabling-automated-backups-3 * Disabling-automated-backups-4 * Skipping-task-if-not-aurora * Adding-subnet-group-to-instances * Adding-subnet-group-to-instances * Updating-SG-return-values * Updating-SG-return-values-2 * Updating-SG-return-values-3 * Updating-SG-return-values-4 * Updating-SG-return-value-debug * Updating-SG-return-value-debug-2 * Updating-SG-return-value-debug-3 * Removing-debug-tasks * Removing-init-var-for-SG-list * Adding-character-set-option --------- Co-authored-by: Matej Stajduhar <[email protected]> * Fixing truthy variable mistakes. (#2662) * Fixing installer variable bug. * Fixing tests for external PRs. * Testing with a fork. * Adding repo owner's username into installer string. * Refactoring config repo detection to simplify. * No longer permitted to use an integer as a truthy value. * No longer permitted to use existence check as a truthy value. * Can't see a reason why linotp var shouldn't be a boolean. * No longer permitted to use existence check as a truthy value. * Fixing truthy errors in ce_deploy role. * No longer permitted to use an integer as a truthy value. * feat(php): Add FPM slow logrotate (#2625) * feat(php): Support removal of APCU, add FPM slow logrotate * simplify condition * revert apcu installed setting, not needed * r73458-install-php-gmp-by-default2 (#2667) * r73458-install-php-gmp-by-default2 * re-add required packages * Wazuh-mitre-report-setup (#2588) * Wazuh-mitre-report-setup * Wazuh-mitre-shellshock-longurl-block * Fixing-vars * Wazuh-mitre-report-setup-PR-2.x * Wazuh mitre report setup pr 2.x (#2669) * Wazuh-mitre-report-setup * Wazuh-mitre-shellshock-longurl-block * Fixing-vars * Wazuh-mitre-report-setup-PR-2.x * Wazuh-mitre-report-setup-PR-2.x * pin_ansible_version * pin_ansible_version * resolve conflicts * pin_ansible_version * pin_ansible_version * pin_ansible_version_fix_upgrade_timer * pin_ansible_version_fix_upgrade_timer * pin_ansible_version_fix_upgrade_timer * pin_ansible_version_disable_upgrade_timer * pin_ansible_version_disable_upgrade_timer * pin_ansible_version_disable_upgrade_timer * pin_ansible_version_disable_upgrade_timer --------- Co-authored-by: drazenCE <[email protected]> Co-authored-by: Matej Štajduhar <[email protected]> Co-authored-by: Matej Stajduhar <[email protected]> Co-authored-by: Greg Harvey <[email protected]> Co-authored-by: Klaus Purer <[email protected]> Co-authored-by: nfawbert <[email protected]>
1 parent 4219dd7 commit e25f505

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

roles/debian/ansible/defaults/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
ce_ansible_version: "<12.0"
32
ce_ansible:
43
# These are usually set in the _init role using _venv_path, _venv_command and _venv_install_username but can be overridden.
54
#venv_path: "/home/{{ ce_provision.username }}/ansible"
65
#venv_command: /usr/bin/python3.11 -m venv
76
#venv_install_username: ansible # user to become when creating venv
7+
ansible_version: "<12.0" # also check install.sh script in the repo root and set the version there accordingly.
88
upgrade:
9-
enabled: true # create systemd timer to auto-upgrade Ansible
10-
command: "{{ _venv_path }}/bin/python3 -m pip install --upgrade ansible{{ ce_ansible_version }}" # if you set venv_path above then set it here too.
9+
enabled: false # create systemd timer to auto-upgrade Ansible. Temporary disabled due to ansible 2.19 breaking changes.
10+
command: "{{ _venv_path }}/bin/python3 -m pip install --upgrade ansible" # if you set venv_path above then set it here too
1111
on_calendar: "*-*-* 01:30:00" # see systemd.time documentation - https://www.freedesktop.org/software/systemd/man/latest/systemd.time.html#Calendar%20Events
1212
#timer_name: upgrade_ansible
1313
linters:

roles/debian/ansible/tasks/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
packages:
6161
- name: pip
6262
state: latest
63-
- name: "ansible{{ ce_ansible_version }}"
63+
- name: "ansible{{ ce_ansible.ansible_version }}"
6464
- name: python-debian
6565

6666
- name: Install linters.
@@ -86,7 +86,8 @@
8686
block:
8787
- name: Build systemd timer variables string.
8888
ansible.builtin.set_fact:
89-
_timer: "{'{{ ce_ansible.upgrade.timer_name | default(_ce_ansible_timer_name) }}': { timer_command: '{{ ce_ansible.upgrade.command | quote }}'', timer_OnCalendar: '{{ ce_ansible.upgrade.on_calendar }}' }}"
89+
_timer: "{'{{ ce_ansible.upgrade.timer_name | default(_ce_ansible_timer_name) }}': { timer_command: '{{ ce_ansible.upgrade.command }}', timer_OnCalendar: '{{ ce_ansible.upgrade.on_calendar }}' }}"
90+
9091
- name: Turn the timer string into a dictionary.
9192
ansible.builtin.set_fact:
9293
_timer: "{{ _timer.splitlines() | map('from_yaml') | list }}"

0 commit comments

Comments
 (0)