Merge pull request #103 from edx/devstack-services-python311-upgrade

Devstack services python311 upgrade
edx · Nov 15, 2024 · 8a03d25 · 8a03d25
2 parents 3c8c668 + 369ddcc
commit 8a03d25
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 34 deletions.
diff --git a/playbooks/roles/analytics_api/defaults/main.yml b/playbooks/roles/analytics_api/defaults/main.yml
@@ -42,10 +42,6 @@ analytics_api_newrelic_appname: 'analytics-api'
 analytics_api_debian_pkgs:
   - 'libmysqlclient-dev'
 
-ANALYTICS_API_USE_PYTHON12: False
-
-ANALYTICS_API_USE_PYTHON38: True
-
 ANALYTICS_API_VERSION: "master"
 ANALYTICS_API_NGINX_PORT: '1{{ analytics_api_gunicorn_port }}'
 ANALYTICS_API_SSL_NGINX_PORT: '4{{ analytics_api_gunicorn_port }}'

diff --git a/playbooks/roles/analytics_api/meta/main.yml b/playbooks/roles/analytics_api/meta/main.yml
@@ -21,8 +21,7 @@
 
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python312: '{{ ANALYTICS_API_USE_PYTHON12 }}'
-    edx_django_service_use_python38: '{{ ANALYTICS_API_USE_PYTHON38 }}'
+    edx_django_service_use_python38: true
     edx_django_service_repos: '{{ ANALYTICS_API_REPOS }}'
     edx_django_service_name: '{{ analytics_api_service_name }}'
     edx_django_service_user: '{{ analytics_api_user }}'

diff --git a/playbooks/roles/blockstore/defaults/main.yml b/playbooks/roles/blockstore/defaults/main.yml
@@ -14,8 +14,6 @@ BLOCKSTORE_GIT_PATH: 'edx'
 BLOCKSTORE_VERSION: 'master'
 BLOCKSTORE_GIT_IDENTITY: !!null
 
-BLOCKSTORE_USE_PYTHON38: True
-
 BLOCKSTORE_REPOS:
   - PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}'
     DOMAIN: '{{ COMMON_GIT_MIRROR }}'

diff --git a/playbooks/roles/blockstore/meta/main.yml b/playbooks/roles/blockstore/meta/main.yml
@@ -8,7 +8,7 @@
 #
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: "{{ BLOCKSTORE_USE_PYTHON38 }}"
+    edx_django_service_use_python311: true
     edx_django_service_name: '{{ blockstore_service_name }}'
     edx_django_service_user: '{{ blockstore_user }}'
     edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ blockstore_service_name }}'

diff --git a/playbooks/roles/commerce_coordinator/defaults/main.yml b/playbooks/roles/commerce_coordinator/defaults/main.yml
@@ -29,8 +29,6 @@ commerce_coordinator_venv_dir: "{{ commerce_coordinator_venvs_dir }}/commerce_co
 commerce_coordinator_celery_default_queue: 'commerce_coordinator.default'
 commerce_coordinator_hostname: "commerce-coordinator"
 
-COMMERCE_COORDINATOR_USE_PYTHON38: True
-
 COMMERCE_COORDINATOR_CELERY_ALWAYS_EAGER: false
 COMMERCE_COORDINATOR_CELERY_BROKER_TRANSPORT: ''
 COMMERCE_COORDINATOR_CELERY_BROKER_USER: ''

diff --git a/playbooks/roles/commerce_coordinator/meta/main.yml b/playbooks/roles/commerce_coordinator/meta/main.yml
@@ -12,7 +12,7 @@
 #
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: '{{ COMMERCE_COORDINATOR_USE_PYTHON38 }}'
+    edx_django_service_use_python311: true
     edx_django_service_version: '{{ COMMERCE_COORDINATOR_VERSION }}'
     edx_django_service_name: '{{ commerce_coordinator_service_name }}'
     edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ commerce_coordinator_service_name }}'

diff --git a/playbooks/roles/credentials/meta/main.yml b/playbooks/roles/credentials/meta/main.yml
@@ -12,7 +12,7 @@
 #
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: true
+    edx_django_service_use_python311: true
     edx_django_service_version: '{{ CREDENTIALS_VERSION }}'
     edx_django_service_name: '{{ credentials_service_name }}'
     edx_django_service_config_overrides: '{{ credentials_service_config_overrides }}'

diff --git a/playbooks/roles/designer/defaults/main.yml b/playbooks/roles/designer/defaults/main.yml
@@ -24,8 +24,6 @@ designer_gunicorn_port: 8808
 
 designer_debian_pkgs: []
 
-DESIGNER_USE_PYTHON38: True
-
 DESIGNER_NGINX_PORT: '1{{ designer_gunicorn_port }}'
 DESIGNER_SSL_NGINX_PORT: '4{{ designer_gunicorn_port }}'
 

diff --git a/playbooks/roles/designer/meta/main.yml b/playbooks/roles/designer/meta/main.yml
@@ -12,8 +12,7 @@
 
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: '{{ DESIGNER_USE_PYTHON38 }}'
-    edx_django_service_use_python3: '{{ not DESIGNER_USE_PYTHON38 }}'
+    edx_django_service_use_python311: true
     edx_django_service_version: '{{ DESIGNER_VERSION }}'
     edx_django_service_name: '{{ designer_service_name }}'
     edx_django_service_config_overrides: '{{ designer_service_config_overrides }}'

diff --git a/playbooks/roles/discovery/defaults/main.yml b/playbooks/roles/discovery/defaults/main.yml
@@ -36,7 +36,6 @@ discovery_code_dir: "{{ discovery_home }}/{{ discovery_service_name }}"
 
 DISCOVERY_NODE_VERSION: '16.14.0'
 DISCOVERY_NPM_VERSION: '8.5.5'
-DISCOVERY_USE_PYTHON38: True
 
 #
 # OS packages

diff --git a/playbooks/roles/discovery/meta/main.yml b/playbooks/roles/discovery/meta/main.yml
@@ -20,7 +20,7 @@
 # }
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: '{{ DISCOVERY_USE_PYTHON38 }}'
+    edx_django_service_use_python311: true
     edx_django_service_repos: '{{ DISCOVERY_REPOS }}'
     edx_django_service_name: '{{ discovery_service_name }}'
     edx_django_service_user: '{{ discovery_user }}'

diff --git a/playbooks/roles/enterprise_catalog/defaults/main.yml b/playbooks/roles/enterprise_catalog/defaults/main.yml
@@ -35,8 +35,6 @@ ENTERPRISE_CATALOG_CELERY_BROKER_PASSWORD: ''
 ENTERPRISE_CATALOG_CELERY_BROKER_HOSTNAME: ''
 ENTERPRISE_CATALOG_CELERY_BROKER_VHOST: ''
 
-ENTERPRISE_CATALOG_USE_PYTHON38: True
-
 enterprise_catalog_environment:
   ENTERPRISE_CATALOG_CFG: '{{ COMMON_CFG_DIR }}/{{ enterprise_catalog_service_name }}.yml'
 

diff --git a/playbooks/roles/enterprise_catalog/meta/main.yml b/playbooks/roles/enterprise_catalog/meta/main.yml
@@ -12,7 +12,7 @@
 
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: '{{ ENTERPRISE_CATALOG_USE_PYTHON38 }}'
+    edx_django_service_use_python311: true
     edx_django_service_enable_experimental_docker_shim: '{{ ENTERPRISE_CATALOG_ENABLE_EXPERIMENTAL_DOCKER_SHIM }}'
     edx_django_service_version: '{{ ENTERPRISE_CATALOG_VERSION }}'
     edx_django_service_name: '{{ enterprise_catalog_service_name }}'

diff --git a/playbooks/roles/insights/defaults/main.yml b/playbooks/roles/insights/defaults/main.yml
@@ -231,9 +231,6 @@ insights_requirements:
   - production.txt
   - optional.txt
 
-# flag to run Insights on Python 3.8
-INSIGHTS_USE_PYTHON38: true
-
 #
 # OS packages
 #

diff --git a/playbooks/roles/insights/meta/main.yml b/playbooks/roles/insights/meta/main.yml
@@ -20,7 +20,7 @@ dependencies:
         code: "{{ insights_code_dir | default(None) }}"
         env: "{{ insights_home | default(None) }}/insights_env"
   - role: edx_service
-    edx_service_use_python38: "{{ INSIGHTS_USE_PYTHON38 }}"
+    edx_service_use_python311: true
     edx_service_name: "{{ insights_service_name }}"
     edx_service_config: "{{ INSIGHTS_CONFIG }}"
     edx_service_repos: "{{ INSIGHTS_REPOS }}"

diff --git a/playbooks/roles/learner_portal/tasks/main.yml b/playbooks/roles/learner_portal/tasks/main.yml
@@ -57,7 +57,7 @@
 
 # we need to do this so that npm can find a node install to use to build node-sass
 - name: prepend node path
-  shell: "{{ learner_portal_nodeenv_bin }}/npm config set scripts-prepend-node-path true"
+  shell: "export PATH={{ learner_portal_nodeenv_bin }}:$PATH"
   environment: "{{ learner_portal_env_vars }}"
   become_user: "{{ learner_portal_user }}"
   tags:

diff --git a/playbooks/roles/license_manager/defaults/main.yml b/playbooks/roles/license_manager/defaults/main.yml
@@ -29,8 +29,6 @@ license_manager_venv_dir: "{{ license_manager_venvs_dir }}/license_manager"
 license_manager_celery_default_queue: 'license_manager.default'
 license_manager_hostname: "license-manager"
 
-LICENSE_MANAGER_USE_PYTHON38: True
-
 LICENSE_MANAGER_CELERY_ALWAYS_EAGER: false
 LICENSE_MANAGER_CELERY_BROKER_TRANSPORT: ''
 LICENSE_MANAGER_CELERY_BROKER_USER: ''

diff --git a/playbooks/roles/license_manager/meta/main.yml b/playbooks/roles/license_manager/meta/main.yml
@@ -12,7 +12,7 @@
 #
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: '{{ LICENSE_MANAGER_USE_PYTHON38 }}'
+    edx_django_service_use_python311: true
     edx_django_service_version: '{{ LICENSE_MANAGER_VERSION }}'
     edx_django_service_name: '{{ license_manager_service_name }}'
     edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ license_manager_service_name }}'

diff --git a/playbooks/roles/program_console/tasks/main.yml b/playbooks/roles/program_console/tasks/main.yml
@@ -57,7 +57,7 @@
 
 #we need to do this so that npm can find a node install to use to build node-sass
 - name: prepend node path
-  shell: "{{ program_console_nodeenv_bin }}/npm config set scripts-prepend-node-path true"
+  shell: "export PATH={{ program_console_nodeenv_bin }}:$PATH"
   environment: "{{ program_console_env_vars }}"
   become_user: "{{ program_console_user }}"
   tags:

diff --git a/playbooks/roles/registrar/defaults/main.yml b/playbooks/roles/registrar/defaults/main.yml
@@ -26,8 +26,6 @@ registrar_venvs_dir: "{{ registrar_app_dir }}/venvs"
 registrar_venv_dir: "{{ registrar_venvs_dir }}/registrar"
 registrar_celery_default_queue: 'registrar.default'
 
-REGISTRAR_USE_PYTHON38: True
-
 REGISTRAR_CELERY_ALWAYS_EAGER: false
 REGISTRAR_CELERY_BROKER_TRANSPORT: 'redis'
 REGISTRAR_CELERY_BROKER_USER: ''

diff --git a/playbooks/roles/registrar/meta/main.yml b/playbooks/roles/registrar/meta/main.yml
@@ -12,7 +12,7 @@
 #
 dependencies:
   - role: edx_django_service
-    edx_django_service_use_python38: '{{ REGISTRAR_USE_PYTHON38 }}'
+    edx_django_service_use_python311: true
     edx_django_service_version: '{{ REGISTRAR_VERSION }}'
     edx_django_service_name: '{{ registrar_service_name }}'
     edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ registrar_service_name }}'