From d9a1bae336fab015f64e07bd20c6a58eb732feaf Mon Sep 17 00:00:00 2001 From: nadeemshahzad Date: Thu, 8 Aug 2024 12:44:25 +0500 Subject: [PATCH] feat: iter2 --- playbooks/roles/analytics_api/defaults/main.yml | 2 +- playbooks/roles/analytics_api/meta/main.yml | 2 +- playbooks/roles/ecommerce/defaults/main.yml | 2 +- playbooks/roles/ecommerce/meta/main.yml | 2 +- playbooks/roles/ecomworker/defaults/main.yml | 2 +- .../ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 | 2 +- playbooks/roles/insights/defaults/main.yml | 2 +- playbooks/roles/xqueue/defaults/main.yml | 2 -- playbooks/roles/xqueue/templates/xqueue.conf.j2 | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/playbooks/roles/analytics_api/defaults/main.yml b/playbooks/roles/analytics_api/defaults/main.yml index bb72c8820e3..c93f04540f4 100644 --- a/playbooks/roles/analytics_api/defaults/main.yml +++ b/playbooks/roles/analytics_api/defaults/main.yml @@ -48,7 +48,7 @@ ANALYTICS_API_VERSION: "master" ANALYTICS_API_NGINX_PORT: '1{{ analytics_api_gunicorn_port }}' ANALYTICS_API_SSL_NGINX_PORT: '4{{ analytics_api_gunicorn_port }}' -ANALYTICS_API_GIT_URL: "https://github.com/edx/edx-analytics-data-api.git" +ANALYTICS_API_REPOSITORY_GIT_URL: "https://github.com/edx/edx-analytics-data-api.git" ANALYTICS_API_REPOS: - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}" diff --git a/playbooks/roles/analytics_api/meta/main.yml b/playbooks/roles/analytics_api/meta/main.yml index f477e495808..b8961270801 100644 --- a/playbooks/roles/analytics_api/meta/main.yml +++ b/playbooks/roles/analytics_api/meta/main.yml @@ -52,4 +52,4 @@ dependencies: edx_django_service_decrypt_config_enabled: '{{ ANALYTICS_API_DECRYPT_CONFIG_ENABLED }}' edx_django_service_copy_config_enabled: '{{ ANALYTICS_API_COPY_CONFIG_ENABLED }}' edx_django_datadog_service: '{{ analytics_api_datadog_service_name }}' - edx_django_service_git_url: '{{ ANALYTICS_API_GIT_URL }}' + edx_django_service_git_url: '{{ ANALYTICS_API_REPOSITORY_GIT_URL }}' diff --git a/playbooks/roles/ecommerce/defaults/main.yml b/playbooks/roles/ecommerce/defaults/main.yml index 28381a2c4b6..293bfecd07c 100644 --- a/playbooks/roles/ecommerce/defaults/main.yml +++ b/playbooks/roles/ecommerce/defaults/main.yml @@ -13,7 +13,7 @@ ECOMMERCE_GIT_IDENTITY: !!null -ECOMMERCE_GIT_URL: "https://github.com/edx/ecommerce.git" +ECOMMERCE_REPOSITORY_GIT_URL: "https://github.com/edx/ecommerce.git" ECOMMERCE_REPOS: - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}" DOMAIN: "{{ COMMON_GIT_MIRROR }}" diff --git a/playbooks/roles/ecommerce/meta/main.yml b/playbooks/roles/ecommerce/meta/main.yml index 64cdb37977a..58883e0a189 100644 --- a/playbooks/roles/ecommerce/meta/main.yml +++ b/playbooks/roles/ecommerce/meta/main.yml @@ -69,7 +69,7 @@ dependencies: edx_django_service_copy_config_enabled: '{{ ECOMMERCE_COPY_CONFIG_ENABLED }}' EDX_DJANGO_SERVICE_ENABLE_ADMIN_URLS_RESTRICTION: '{{ ECOMMERCE_ENABLE_ADMIN_URLS_RESTRICTION }}' EDX_DJANGO_SERVICE_ADMIN_URLS: '{{ ECOMMERCE_ADMIN_URLS }}' - edx_django_service_git_url: '{{ ECOMMERCE_GIT_URL }}' + edx_django_service_git_url: '{{ ECOMMERCE_REPOSITORY_GIT_URL }}' - role: antivirus ANTIVIRUS_SCAN_DIRECTORY: "{{ ECOMMERCE_ANTIVIRUS_SCAN_DIRECTORY }}" when: ECOMMERCE_ENABLE_ANTIVIRUS diff --git a/playbooks/roles/ecomworker/defaults/main.yml b/playbooks/roles/ecomworker/defaults/main.yml index 8234ffe5f45..1e2a9ff1ff1 100644 --- a/playbooks/roles/ecomworker/defaults/main.yml +++ b/playbooks/roles/ecomworker/defaults/main.yml @@ -14,7 +14,7 @@ ECOMMERCE_WORKER_GIT_IDENTITY: !!null ECOMMERCE_WORKER_VERSION: '2u/main' ECOMMERCE_WORKER_USE_PYTHON38: true -ECOMMERCE_WORKER_REPOSITORY_URL: "https://github.com/edx/ecommerce-worker.git" +ECOMMERCE_WORKER_REPOSITORY_GIT_URL: "https://github.com/edx/ecommerce-worker.git" ECOMMERCE_WORKER_REPOS: - PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}' DOMAIN: '{{ COMMON_GIT_MIRROR }}' diff --git a/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 b/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 index 6c817191e94..0d76d20d3af 100644 --- a/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 +++ b/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 @@ -25,7 +25,7 @@ export DD_TRACE_LOG_STREAM_HANDLER=false export DD_PROFILING_ENABLED=true export DD_DATA_STREAMS_ENABLED=true export DD_GIT_COMMIT_SHA="{{ app_version }}" -export DD_GIT_REPOSITORY_URL="{{ ECOMMERCE_WORKER_REPOSITORY_URL }}" +export DD_GIT_REPOSITORY_URL="{{ ECOMMERCE_WORKER_REPOSITORY_GIT_URL }}" {% endif -%} source {{ ecommerce_worker_home }}/{{ ecommerce_worker_service_name }}_env diff --git a/playbooks/roles/insights/defaults/main.yml b/playbooks/roles/insights/defaults/main.yml index 715a31b8699..cac61e99316 100644 --- a/playbooks/roles/insights/defaults/main.yml +++ b/playbooks/roles/insights/defaults/main.yml @@ -179,7 +179,7 @@ INSIGHTS_MODULE_PREVIEW_URL: "{{ INSIGHTS_LMS_BASE }}/xblock" INSIGHTS_VERSION: "master" INSIGHTS_GIT_IDENTITY: !!null -INSIGHTS_GIT_REPOSITORY_URL: "https://github.com/edx/edx-analytics-dashboard.git" +INSIGHTS_REPOSITORY_GIT_URL: "https://github.com/edx/edx-analytics-dashboard.git" INSIGHTS_REPOS: - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}" DOMAIN: "{{ COMMON_GIT_MIRROR }}" diff --git a/playbooks/roles/xqueue/defaults/main.yml b/playbooks/roles/xqueue/defaults/main.yml index d95fbaa266b..510d69f28f8 100644 --- a/playbooks/roles/xqueue/defaults/main.yml +++ b/playbooks/roles/xqueue/defaults/main.yml @@ -131,8 +131,6 @@ XQUEUE_CONFIG: XQUEUE_VERSION: "master" XQUEUE_GIT_IDENTITY: !!null -XQUEUE_GIT_REPOSITORY_URL: "https://github.com/edx/xqueue.git" - XQUEUE_REPOS: - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}" DOMAIN: "{{ COMMON_GIT_MIRROR }}" diff --git a/playbooks/roles/xqueue/templates/xqueue.conf.j2 b/playbooks/roles/xqueue/templates/xqueue.conf.j2 index eadd3b2052b..6ccf03114d3 100644 --- a/playbooks/roles/xqueue/templates/xqueue.conf.j2 +++ b/playbooks/roles/xqueue/templates/xqueue.conf.j2 @@ -17,7 +17,7 @@ directory={{ xqueue_code_dir }} # Copied DD_TRACE_LOG_STREAM_HANDLER config from edx_django_service. This is required # to disable Datadog trace debug logging. -environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQUEUE_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}{% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %}DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true,DD_TAGS="service:{{ XQUEUE_DATADOG_APPNAME }} version:{{ app_version }}",DD_TRACE_LOG_STREAM_HANDLER=false,DD_PROFILING_ENABLED=true,DD_DATA_STREAMS_ENABLED=true,DD_GIT_COMMIT_SHA={{ app_version }},DD_GIT_REPOSITORY_URL={{ XQUEUE_REPOSITORY_URL }},{% endif -%}PID=/var/tmp/xqueue.pid,PORT={{ xqueue_gunicorn_port }},ADDRESS={{ xqueue_gunicorn_host }},LANG={{ XQUEUE_LANG }},DJANGO_SETTINGS_MODULE=xqueue.{{ XQUEUE_SETTINGS }},XQUEUE_CFG={{ COMMON_CFG_DIR }}/xqueue.yml +environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQUEUE_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}{% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %}DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true,DD_TAGS="service:{{ XQUEUE_DATADOG_APPNAME }} version:{{ app_version }}",DD_TRACE_LOG_STREAM_HANDLER=false,DD_PROFILING_ENABLED=true,DD_DATA_STREAMS_ENABLED=true,{% endif -%}PID=/var/tmp/xqueue.pid,PORT={{ xqueue_gunicorn_port }},ADDRESS={{ xqueue_gunicorn_host }},LANG={{ XQUEUE_LANG }},DJANGO_SETTINGS_MODULE=xqueue.{{ XQUEUE_SETTINGS }},XQUEUE_CFG={{ COMMON_CFG_DIR }}/xqueue.yml stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log