Skip to content

Commit 0c45bc7

Browse files
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

playbooks/roles/edxapp/defaults/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,14 +1807,13 @@ edxapp_debian_pkgs:
18071807
- libsqlite3-dev
18081808

18091809
edxapp_release_specific_debian_pkgs:
1810-
xenial:
1811-
- ipython
1812-
- python-dev
18131810
bionic:
18141811
- ipython
18151812
- python-dev
18161813
focal:
18171814
- ipython3
1815+
noble:
1816+
- ipython3
18181817

18191818
edxapp_debian_pkgs_default: "{{ edxapp_debian_pkgs + edxapp_release_specific_debian_pkgs[ansible_distribution_release] }}"
18201819

playbooks/roles/edxapp/tasks/deploy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
# creates the supervisor jobs for the
455455
# service variants configured, runs
456456
# gather_assets and db migrations
457-
- include: service_variant_config.yml
457+
- import_tasks: service_variant_config.yml
458458
tags:
459459
- service_variant_config
460460
- deploy
@@ -519,9 +519,10 @@
519519
- install:configuration
520520
- install:code
521521

522-
- include: tag_ec2.yml tags=deploy
522+
- import_tasks: tag_ec2.yml
523523
when: COMMON_TAG_EC2_INSTANCE
524524
tags:
525+
- deploy
525526
- remove
526527
- aws
527528

playbooks/roles/edxapp/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@
205205
- install:base
206206

207207
# Set up the python sandbox execution environment
208-
- include: python_sandbox_env.yml
208+
- import_tasks: python_sandbox_env.yml
209209
when: EDXAPP_PYTHON_SANDBOX
210210
tags:
211211
- deploy
212212

213-
- include: deploy.yml
213+
- import_tasks: deploy.yml
214214
tags:
215215
- deploy
216216

playbooks/roles/edxapp/tasks/python_sandbox_env.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
alternatives:
1717
name: libblas.so.3
1818
path: /usr/lib/libblas/libblas.so.3
19-
when: not libblas_file.stat.exists and (ansible_distribution_release != 'bionic' and ansible_distribution_release != 'focal')
19+
when: not libblas_file.stat.exists and (ansible_distribution_release != 'bionic' and ansible_distribution_release != 'focal' and ansible_distribution_release != 'noble')
2020

2121
- name: code sandbox | Use libblas.so.3 in Ubuntu
2222
alternatives:
@@ -32,6 +32,13 @@
3232
path: /usr/lib/x86_64-linux-gnu/blas/libblas.so.3.9.0
3333
when: ansible_distribution_release == 'focal'
3434

35+
- name: code sandbox | Use libblas.so.3 in Ubuntu
36+
alternatives:
37+
name: libblas.so.3
38+
link: /usr/lib/x86_64-linux-gnu/blas/libblas.so.3
39+
path: /usr/lib/x86_64-linux-gnu/blas/libblas.so.3.12.0
40+
when: ansible_distribution_release == 'noble'
41+
3542
- name: code sandbox | Check which `liblapac` to use
3643
stat:
3744
path: /usr/lib/lapack/liblapack.so.3gf
@@ -47,7 +54,7 @@
4754
alternatives:
4855
name: liblapack.so.3
4956
path: /usr/lib/lapack/liblapack.so.3
50-
when: not liblapack_file.stat.exists and (ansible_distribution_release != 'bionic' and ansible_distribution_release != 'focal')
57+
when: not liblapack_file.stat.exists and (ansible_distribution_release != 'bionic' and ansible_distribution_release != 'focal' and ansible_distribution_release != 'noble')
5158

5259
- name: code sandbox | Use liblapack.so.3 in Ubuntu
5360
alternatives:
@@ -63,6 +70,13 @@
6370
path: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3.9.0
6471
when: ansible_distribution_release == 'focal'
6572

73+
- name: code sandbox | Use liblapack.so.3 in Ubuntu
74+
alternatives:
75+
name: liblapack.so.3
76+
link: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3
77+
path: /usr/lib/x86_64-linux-gnu/lapack/liblapack.so.3.12.0
78+
when: ansible_distribution_release == 'noble'
79+
6680
- name: code sandbox | Create edxapp sandbox user
6781
user:
6882
name: "{{ edxapp_sandbox_user }}"

playbooks/roles/edxapp/tasks/service_variant_config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,8 @@
321321
- assets
322322

323323
- name: Create or update SiteConfiguration
324-
include: site_configuration.yml
324+
include_tasks: site_configuration.yml
325325
when: celery_worker is not defined and EDXAPP_SITE_CONFIGURATION
326326
with_items: "{{ EDXAPP_SITE_CONFIGURATION }}"
327-
become_user: "{{ edxapp_user }}"
328327
tags:
329328
- create_or_update_site_configuration

playbooks/roles/edxapp_common/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ edxapp_common_debian_pkgs_default:
2626
- swig
2727

2828
edxapp_common_release_specific_debian_pkgs:
29-
xenial:
30-
- libpng12-dev
3129
bionic:
3230
- libpng-dev
3331
focal:
3432
- libpng-dev
33+
noble:
34+
- libpng-dev
3535

3636
edxapp_common_debian_pkgs: "{{ edxapp_common_debian_pkgs_default + edxapp_common_release_specific_debian_pkgs[ansible_distribution_release] }}"

playbooks/roles/forum/tasks/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@
129129
- manage
130130
- manage:db
131131

132-
- include: test.yml
132+
- import_tasks: test.yml
133133
tags:
134134
- deploy
135135

136-
- include: tag_ec2.yml
136+
- import_tasks: tag_ec2.yml
137137
when: COMMON_TAG_EC2_INSTANCE
138138
tags:
139139
- deploy

playbooks/roles/forum/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@
101101
- install
102102
- install:base
103103

104-
- include: deploy.yml
104+
- import_tasks: deploy.yml
105105
tags:
106106
- deploy

playbooks/roles/gitreload/tasks/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
mode: "0600"
1313
become_user: "{{ common_web_user }}"
1414

15-
- include: course_pull.yml
15+
- import_tasks: course_pull.yml
1616
when: GITRELOAD_COURSE_CHECKOUT|bool
1717
tags: course_pull
1818

playbooks/roles/gitreload/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@
8181
- python
8282
- pip
8383

84-
- include: deploy.yml tags=deploy
84+
- import_tasks: deploy.yml
85+
tags:
86+
- deploy

playbooks/roles/graphite/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@
8585
- install
8686
- install:base
8787

88-
- include: whisper.yml
89-
- include: carbon.yml
90-
- include: graphite-api.yml
88+
- import_tasks: whisper.yml
89+
- import_tasks: carbon.yml
90+
- import_tasks: graphite-api.yml

playbooks/roles/hotg/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,6 @@
138138
- install
139139
- install:base
140140

141-
- include: deploy.yml tags=deploy
141+
- import_tasks: deploy.yml
142+
tags:
143+
- deploy

playbooks/roles/insights/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ insights_debian_pkgs:
244244
- python3-dev
245245

246246
insights_release_specific_debian_pkgs:
247-
xenial:
248-
- openjdk-8-jdk
249247
bionic:
250248
- openjdk-8-jdk
251249
focal:
252250
- openjdk-8-jdk
251+
noble:
252+
- openjdk-8-jdk

0 commit comments

Comments
 (0)