From 810248d5e02d1bd612322c15c0127032120992e9 Mon Sep 17 00:00:00 2001 From: pkulkark Date: Thu, 6 May 2021 17:27:36 +0530 Subject: [PATCH 1/2] TESTING: move reindex_command and use --all --- playbooks/roles/demo/tasks/deploy.yml | 7 +++++++ playbooks/roles/edxapp/tasks/deploy.yml | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/playbooks/roles/demo/tasks/deploy.yml b/playbooks/roles/demo/tasks/deploy.yml index 2754b761cda..d512a089145 100644 --- a/playbooks/roles/demo/tasks/deploy.yml +++ b/playbooks/roles/demo/tasks/deploy.yml @@ -59,3 +59,10 @@ args: chdir: "{{ demo_edxapp_code_dir }}" when: demo_checkout.changed + +- name: reindex all courses + shell: ". {{ demo_edxapp_env }} && yes | {{ demo_edxapp_venv_bin }}/python ./manage.py cms reindex_course --all --settings={{ demo_edxapp_settings }}" + args: + chdir: "{{ demo_edxapp_code_dir }}" + become_user: "{{ common_web_user }}" + when: EDXAPP_REINDEX_ALL_COURSES \ No newline at end of file diff --git a/playbooks/roles/edxapp/tasks/deploy.yml b/playbooks/roles/edxapp/tasks/deploy.yml index 5a5e85b911c..a1e54b282ea 100644 --- a/playbooks/roles/edxapp/tasks/deploy.yml +++ b/playbooks/roles/edxapp/tasks/deploy.yml @@ -483,15 +483,15 @@ - manage - manage:db -- name: reindex all courses - shell: ". {{ edxapp_app_dir }}/edxapp_env && {{ edxapp_venv_bin }}/python ./manage.py cms reindex_course --setup --settings={{ edxapp_settings }}" - args: - chdir: "{{ edxapp_code_dir }}" - become_user: "{{ common_web_user }}" - when: EDXAPP_REINDEX_ALL_COURSES - tags: - - install - - install:base +# - name: reindex all courses +# shell: ". {{ edxapp_app_dir }}/edxapp_env && {{ edxapp_venv_bin }}/python ./manage.py cms reindex_course --setup --settings={{ edxapp_settings }}" +# args: +# chdir: "{{ edxapp_code_dir }}" +# become_user: "{{ common_web_user }}" +# when: EDXAPP_REINDEX_ALL_COURSES +# tags: +# - install +# - install:base - name: install cron job to run clearsessions cron: From 3972e001f7c9284235fcffa8efe9167421073145 Mon Sep 17 00:00:00 2001 From: pkulkark Date: Wed, 12 May 2021 16:41:30 +0530 Subject: [PATCH 2/2] fix: Move reindex command into forum role --- playbooks/roles/demo/tasks/deploy.yml | 7 ------- playbooks/roles/edxapp/tasks/deploy.yml | 10 ---------- playbooks/roles/forum/tasks/deploy.yml | 7 +++++++ 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/playbooks/roles/demo/tasks/deploy.yml b/playbooks/roles/demo/tasks/deploy.yml index d512a089145..2754b761cda 100644 --- a/playbooks/roles/demo/tasks/deploy.yml +++ b/playbooks/roles/demo/tasks/deploy.yml @@ -59,10 +59,3 @@ args: chdir: "{{ demo_edxapp_code_dir }}" when: demo_checkout.changed - -- name: reindex all courses - shell: ". {{ demo_edxapp_env }} && yes | {{ demo_edxapp_venv_bin }}/python ./manage.py cms reindex_course --all --settings={{ demo_edxapp_settings }}" - args: - chdir: "{{ demo_edxapp_code_dir }}" - become_user: "{{ common_web_user }}" - when: EDXAPP_REINDEX_ALL_COURSES \ No newline at end of file diff --git a/playbooks/roles/edxapp/tasks/deploy.yml b/playbooks/roles/edxapp/tasks/deploy.yml index a1e54b282ea..cad02e4cb73 100644 --- a/playbooks/roles/edxapp/tasks/deploy.yml +++ b/playbooks/roles/edxapp/tasks/deploy.yml @@ -483,16 +483,6 @@ - manage - manage:db -# - name: reindex all courses -# shell: ". {{ edxapp_app_dir }}/edxapp_env && {{ edxapp_venv_bin }}/python ./manage.py cms reindex_course --setup --settings={{ edxapp_settings }}" -# args: -# chdir: "{{ edxapp_code_dir }}" -# become_user: "{{ common_web_user }}" -# when: EDXAPP_REINDEX_ALL_COURSES -# tags: -# - install -# - install:base - - name: install cron job to run clearsessions cron: name: "clear expired Django sessions" diff --git a/playbooks/roles/forum/tasks/deploy.yml b/playbooks/roles/forum/tasks/deploy.yml index ee33800eaa1..c310acdfb8b 100644 --- a/playbooks/roles/forum/tasks/deploy.yml +++ b/playbooks/roles/forum/tasks/deploy.yml @@ -117,5 +117,12 @@ tags: - deploy +- name: reindex all courses + shell: ". {{ edxapp_app_dir }}/edxapp_env && yes | {{ edxapp_venv_bin }}/python ./manage.py cms reindex_course --all --settings={{ edxapp_settings }}" + args: + chdir: "{{ edxapp_code_dir }}" + become_user: "{{ common_web_user }}" + when: EDXAPP_REINDEX_ALL_COURSES + - set_fact: forum_installed: true