Skip to content

Commit 0c45bc7

Browse files
author
nadeemshahzad
committed
feat: add ubuntu 24.04 support
1 parent 580a073 commit 0c45bc7

File tree

40 files changed

+162
-75
lines changed

40 files changed

+162
-75
lines changed

playbooks/create_rds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@
8383
changed_when: "add_role_result.rc == 0"
8484
when: cluster_name is defined and cluster_role_arn is defined
8585

86-
- include: create_db_and_users.yml
86+
- import_tasks: create_db_and_users.yml
8787
when: database_connection.login_host is defined

playbooks/roles/aws/defaults/main.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,25 @@ aws_region: "us-east-1"
3636
aws_s3cmd: "/usr/bin/s3cmd"
3737
aws_cmd: "/usr/local/bin/aws"
3838
aws_requirements: "{{ vhost_dirs.home.path }}/requirements.txt"
39+
aws_venv_dir: "{{ vhost_dirs.home.path }}/venv"
3940

4041
#
4142
# OS packages
4243
#
4344

44-
aws_debian_pkgs:
45-
- python-setuptools
45+
aws_debian_pkgs: "{{ aws_debian_pkgs_default + aws_release_specific_debian_pkgs[ansible_distribution_release] }}"
46+
47+
aws_debian_pkgs_default:
4648
- s3cmd
4749

50+
aws_release_specific_debian_pkgs:
51+
bionic:
52+
- python-setuptools
53+
focal:
54+
- python-setuptools
55+
noble:
56+
- python3-setuptools
57+
4858
aws_redhat_pkgs: []
4959

5060
# The AWS_GATHER_FACTS switch is used to enable/disable data gathering

playbooks/roles/aws/tasks/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,15 @@
7171
requirements: "{{ aws_requirements }}"
7272
state: present
7373
extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }}"
74+
when: ansible_distribution_release != 'noble'
75+
76+
- name: Install aws python packages
77+
pip:
78+
requirements: "{{ aws_requirements }}"
79+
virtualenv: "{{ aws_venv_dir }}"
80+
state: present
81+
extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }}"
82+
when: ansible_distribution_release == 'noble'
7483

7584
- name: Copy the boto global config file
7685
template:

playbooks/roles/common/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
until: add_repo is success
8989
retries: 10
9090
delay: 5
91-
when: ansible_distribution_release == 'bionic' or ansible_distribution_release == 'focal' or ansible_distribution_release == 'jammy'
91+
when: ansible_distribution_release == 'noble' or ansible_distribution_release == 'bionic' or ansible_distribution_release == 'focal' or ansible_distribution_release == 'jammy'
9292
tags:
9393
- install
9494
- install:system-requirements

playbooks/roles/common_vars/defaults/main.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ common_release_specific_debian_pkgs:
149149
- python3.5-dev
150150
jammy:
151151
- python3.8
152+
noble:
153+
- python3.12
152154

153155
common_debian_pkgs: "{{ common_debian_pkgs_default + common_release_specific_debian_pkgs[ansible_distribution_release] }}"
154156

@@ -160,7 +162,12 @@ old_python_debian_pkgs:
160162
- "python2.7=2.7.10-0+{{ ansible_distribution_release }}1"
161163

162164

163-
COMMON_PIP_VERSION: '21.2.1'
165+
COMMON_PIP_VERSION: "{{ common_release_specific_pip_version[ansible_distribution_release] }}"
166+
167+
common_release_specific_pip_version:
168+
bionic: "21.2.1"
169+
focal: "21.2.1"
170+
noble: "24.0"
164171

165172
common_pip_pkgs:
166173
- pip=={{ COMMON_PIP_VERSION }}

playbooks/roles/config-encoders/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,10 +1014,10 @@ data structure is the following::
10141014
- ^name: reload
10151015
- allow:
10161016
- ^user: root
1017-
- include:
1017+
- import_tasks:
10181018
- ^ignore_missing: "yes"
10191019
- /etc/oddjobd.conf.d/*.conf
1020-
- include:
1020+
- import_tasks:
10211021
- ^ignore_missing: "yes"
10221022
- /etc/oddjobd-local.conf
10231023

playbooks/roles/demo/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,6 @@
3737
owner: "{{ demo_edxapp_user }}"
3838
group: "{{ common_web_group }}"
3939

40-
- include: deploy.yml tags=deploy
40+
- import_tasks: deploy.yml
41+
tags:
42+
- deploy

playbooks/roles/ecommerce/defaults/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,10 @@ ecommerce_debian_pkgs:
334334
- python3-dev
335335

336336
ecommerce_release_specific_debian_pkgs:
337-
xenial:
338-
- python-dev
339337
bionic:
340338
- python-dev
341339
focal: []
340+
noble: []
342341

343342
ecommerce_redhat_pkgs: []
344343

playbooks/roles/edx_ansible/defaults/main.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,35 @@ edx_ansible_debian_running_services:
2323
- fail2ban
2424

2525
edx_ansible_debian_pkgs_default:
26-
- python-apt
2726
- libmysqlclient-dev
2827
- git-core
2928
- build-essential
3029
- libxml2-dev
3130
- libxslt1-dev
3231
- curl
33-
- python-yaml
3432
- python3-pip
3533
- python3-mysqldb
3634

3735
edx_ansible_release_specific_debian_pkgs:
3836
xenial:
37+
- python-apt
3938
- python-pip
4039
- python-mysqldb
4140
- python-dev
4241
bionic:
42+
- python-apt
4343
- python-pip
4444
- python-mysqldb
4545
- python-dev
4646
focal:
47+
- python-yaml
48+
- python-apt
4749
- python3-dev
50+
noble:
51+
- python3-apt
52+
- python3-yaml
53+
- python3-virtualenv
54+
- python3.12-dev
4855

4956
edx_ansible_debian_pkgs: "{{ edx_ansible_debian_running_services + edx_ansible_debian_pkgs_default + edx_ansible_release_specific_debian_pkgs[ansible_distribution_release] }}"
5057

playbooks/roles/edx_ansible/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
tags:
5454
- install:system-requirements
5555

56-
- include: deploy.yml
56+
- import_tasks: deploy.yml
5757
tags:
5858
- deploy
5959

0 commit comments

Comments
 (0)