Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[prancible] upgrade the version of ansible #4580

Merged
merged 23 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/molecule_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- freetds
# - friends_of_pul
- geaccirc
- geoserver
# - geoserver
- hr_share
- imagemagick
- kakadu
Expand Down Expand Up @@ -77,27 +77,25 @@ jobs:
# - repec
- researchdata
# - resque_worker
- ruby
# - ruby
- ruby_s
- samba
- saxon
# - saxon
- shared_data
- shibboleth
# - shibboleth
- sidekiq_worker
- simple_annotation
- sneakers_worker
- solrcloud
# - solrcloud
- special_collections
- subversion
- svn
- timezone
- tippecanoe
- towerdeploy
- tomcat8
- video_reserves
- vips
- zookeeper
# - zookeeper_src
# - zookeeper
steps:
- name: Checkout branch
run: |
Expand Down
7 changes: 3 additions & 4 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ verify_ssl = true
name = "pypi"

[packages]
ansible = "==5.4.0"
ansible-lint = "==5.4.0"
ansible = "==9.1.0"
ansible-lint = "==6.22.1"
gitpython = "*"
gitdb = "*"
molecule = "==5.0.1"
molecule = "==6.0.3"
pyyaml = "==6.0"
yamllint = "==1.26.3"
requests = "==2.31.0"
dnspython = "*"
molecule-plugins = {extras = ["docker"], version = "*"}
Expand Down
766 changes: 363 additions & 403 deletions Pipfile.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions playbooks/os_updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
autoclean: true
when: ansible_os_family == "Debian"

## - name: Ubuntu | clear out the local repository of retrieved package files
## apt:
## clean: true
## when: ansible_os_family == "Debian"
- name: Ubuntu | clear out the local repository of retrieved package files
ansible.builtin.apt:
clean: true
when: ansible_os_family == "Debian"

- name: Ubuntu | Check if reboot required
ansible.builtin.stat:
Expand Down
98 changes: 50 additions & 48 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,50 @@
ansible-compat==4.1.2 ; python_version >= "3.11" and python_version < "4.0"
ansible-core==2.12.10 ; python_version >= "3.11" and python_version < "4.0"
ansible==5.10.0 ; python_version >= "3.11" and python_version < "4.0"
arrow==1.2.3 ; python_version >= "3.11" and python_version < "4.0"
attrs==23.1.0 ; python_version >= "3.11" and python_version < "4.0"
binaryornot==0.4.4 ; python_version >= "3.11" and python_version < "4.0"
certifi==2023.5.7 ; python_version >= "3.11" and python_version < "4.0"
cffi==1.15.1 ; python_version >= "3.11" and python_version < "4.0"
chardet==5.1.0 ; python_version >= "3.11" and python_version < "4.0"
charset-normalizer==3.1.0 ; python_version >= "3.11" and python_version < "4.0"
click-help-colors==0.9.1 ; python_version >= "3.11" and python_version < "4.0"
click==8.1.3 ; python_version >= "3.11" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows"
cookiecutter==2.1.1 ; python_version >= "3.11" and python_version < "4.0"
cryptography==41.0.1 ; python_version >= "3.11" and python_version < "4.0"
distro==1.8.0 ; (sys_platform == "linux" or sys_platform == "linux2") and python_version >= "3.11" and python_version < "4.0"
docker==6.1.3 ; python_version >= "3.11" and python_version < "4.0"
enrich==1.2.7 ; python_version >= "3.11" and python_version < "4.0"
gitdb==4.0.10 ; python_version >= "3.11" and python_version < "4.0"
gitpython==3.1.31 ; python_version >= "3.11" and python_version < "4.0"
idna==3.4 ; python_version >= "3.11" and python_version < "4.0"
jinja2-time==0.2.0 ; python_version >= "3.11" and python_version < "4.0"
jinja2==3.1.2 ; python_version >= "3.11" and python_version < "4.0"
jsonschema==4.17.3 ; python_version >= "3.11" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.11" and python_version < "4.0"
markupsafe==2.1.3 ; python_version >= "3.11" and python_version < "4.0"
mdurl==0.1.2 ; python_version >= "3.11" and python_version < "4.0"
molecule-plugins[docker]==23.4.1 ; python_version >= "3.11" and python_version < "4.0"
molecule==5.1.0 ; python_version >= "3.11" and python_version < "4.0"
packaging==23.1 ; python_version >= "3.11" and python_version < "4.0"
pluggy==1.2.0 ; python_version >= "3.11" and python_version < "4.0"
pycparser==2.21 ; python_version >= "3.11" and python_version < "4.0"
pygments==2.15.1 ; python_version >= "3.11" and python_version < "4.0"
pyrsistent==0.19.3 ; python_version >= "3.11" and python_version < "4.0"
python-dateutil==2.8.2 ; python_version >= "3.11" and python_version < "4.0"
python-slugify==8.0.1 ; python_version >= "3.11" and python_version < "4.0"
pywin32==306 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32"
pyyaml==6.0 ; python_version >= "3.11" and python_version < "4.0"
requests==2.31.0 ; python_version >= "3.11" and python_version < "4.0"
resolvelib==0.5.4 ; python_version >= "3.11" and python_version < "4.0"
rich==13.4.2 ; python_version >= "3.11" and python_version < "4.0"
selinux==0.3.0 ; (sys_platform == "linux" or sys_platform == "linux2") and python_version >= "3.11" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.11" and python_version < "4.0"
smmap==5.0.0 ; python_version >= "3.11" and python_version < "4.0"
subprocess-tee==0.4.1 ; python_version >= "3.11" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.11" and python_version < "4.0"
urllib3==2.0.3 ; python_version >= "3.11" and python_version < "4.0"
websocket-client==1.6.1 ; python_version >= "3.11" and python_version < "4.0"
-i https://pypi.org/simple
ansible==9.1.0; python_version >= '3.10'
ansible-compat==4.1.11; python_version >= '3.9'
ansible-core==2.16.2; python_version >= '3.10'
ansible-lint==6.22.1; python_version >= '3.9'
attrs==23.2.0; python_version >= '3.7'
black==23.12.1; python_version >= '3.8'
bracex==2.4; python_version >= '3.8'
certifi==2023.11.17; python_version >= '3.6'
cffi==1.16.0; python_version >= '3.8'
charset-normalizer==3.3.2; python_full_version >= '3.7.0'
click==8.1.7; python_version >= '3.7'
click-help-colors==0.9.4
cryptography==41.0.7; python_version >= '3.7'
dnspython==2.4.2; python_version >= '3.8' and python_version < '4.0'
docker==7.0.0
enrich==1.2.7; python_version >= '3.6'
filelock==3.13.1; python_version >= '3.8'
gitdb==4.0.11; python_version >= '3.7'
gitpython==3.1.41; python_version >= '3.7'
idna==3.6; python_version >= '3.5'
jinja2==3.1.3; python_version >= '3.7'
jmespath==1.0.1; python_version >= '3.7'
jsonschema==4.21.0; python_version >= '3.8'
jsonschema-specifications==2023.12.1; python_version >= '3.8'
markdown-it-py==3.0.0; python_version >= '3.8'
markupsafe==2.1.3; python_version >= '3.7'
mdurl==0.1.2; python_version >= '3.7'
molecule==6.0.3; python_version >= '3.9'
molecule-plugins[docker]==23.5.0; python_version >= '3.9'
mypy-extensions==1.0.0; python_version >= '3.5'
packaging==23.2; python_version >= '3.7'
pathspec==0.12.1; python_version >= '3.8'
platformdirs==4.1.0; python_version >= '3.8'
pluggy==1.3.0; python_version >= '3.8'
pycparser==2.21
pygments==2.17.2; python_version >= '3.7'
pyyaml==6.0; python_version >= '3.6'
referencing==0.32.1; python_version >= '3.8'
requests==2.31.0; python_version >= '3.7'
resolvelib==1.0.1
rich==13.7.0; python_full_version >= '3.7.0'
rpds-py==0.17.1; python_version >= '3.8'
ruamel.yaml==0.18.5; python_version >= '3.7'
ruamel.yaml.clib==0.2.8; python_version < '3.13' and platform_python_implementation == 'CPython'
smmap==5.0.1; python_version >= '3.7'
subprocess-tee==0.4.1; python_version >= '3.8'
urllib3==2.1.0; python_version >= '3.8'
wcmatch==8.5; python_version >= '3.8'
yamllint==1.33.0; python_version >= '3.8'
2 changes: 1 addition & 1 deletion roles/abid/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/apache2/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/bibdata_sqs_poller/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/bind9/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
7 changes: 0 additions & 7 deletions roles/bind9/molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,3 @@
that:
- not pkg_status.changed

- name: get service facts
service_facts:

- name: check if bind9 is installed
fail:
msg: bind9 is not installed
when: ansible_facts.services["bind9"] is not defined
21 changes: 0 additions & 21 deletions roles/byzantine/molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,6 @@
register: present
failed_when:
- present is changed
- name: test for presence byzantine apache config
lineinfile:
path: "/etc/apache2/sites-available/000-default.conf"
line: "{{ item }}"
state: present
loop:
- "Alias /byzantine /var/www/byzantine/current"
check_mode: true
register: present
failed_when:
- name: test for presence byzantine php ini
lineinfile:
path: "/etc/apache2/sites-available/000-default.conf"
line: "{{ item }}"
state: present
loop:
- "upload_max_filesize = 8M"
- "memory_limit = 256M"
check_mode: true
register: present
failed_when:
- name: test for byzantine conf files existence
stat:
path: "{{ item }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/cantaloupe/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/datadog/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/deploy_user/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/dss/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ driver:
name: docker
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
privileged: true
pre_build_image: true
provisioner:
Expand Down
32 changes: 0 additions & 32 deletions roles/dss/molecule/default/molecule.yml-e

This file was deleted.

2 changes: 1 addition & 1 deletion roles/example/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
2 changes: 1 addition & 1 deletion roles/extra_path/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
22 changes: 0 additions & 22 deletions roles/ezproxy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,10 @@
when:
- running_on_server

- name: Ezproxy | install dependencies for 64bit
ansible.builtin.apt:
name: ["lib32ncurses5", "lib32z1"]
state: present
when:
- "'{{ ansible_distribution_release }}' == 'bionic'"

- name: Ezproxy | install dependencies for 64bit
ansible.builtin.apt:
name: ["lib32ncurses6", "lib32z1"]
state: present
when:
- "'{{ ansible_distribution_release }}' == 'jammy'"

- name: Ezproxy | copy ezproxy config.txt
ansible.builtin.template:
Expand Down Expand Up @@ -190,17 +181,6 @@
changed_when: false
when: running_on_server

- name: Ezproxy | copy ezproxy init.d
ansible.builtin.copy:
src: "files/ezproxy"
dest: /etc/init.d/ezproxy
owner: root
group: root
mode: a+x
changed_when: false
when:
- "'{{ ansible_distribution_release }}' == 'bionic'"
- running_on_server

- name: Ezproxy | add shib config user
ansible.builtin.template:
Expand All @@ -220,7 +200,6 @@
mode: a+x
changed_when: false
when:
- "'{{ ansible_distribution_release }}' == 'jammy'"
- running_on_server
notify: reload ezproxy

Expand All @@ -232,7 +211,6 @@
group: root
state: link
when:
- "'{{ ansible_distribution_release }}' == 'jammy'"
- running_on_server

- name: Ezproxy | start ezproxy
Expand Down
2 changes: 1 addition & 1 deletion roles/ffmpeg/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: instance
image: "pulibrary/puldocker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
image: "quay.io/pulibrary/jammy-ansible:latest"
command: ""
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
Expand Down
Loading