Add multitenant support to script #7
Conversation
| @@ -0,0 +1,34 @@ | |||
| #!/bin/bash | |||
| CONFIGURATION_PLAYBOOKS_DIR='/encrypted/ansible/edx/playbooks' | |||
| THEMEX_SCRIPT_DIR='/encrypted/ansible/edx/playbooks/themex_script' | |||
There was a problem hiding this comment.
It's not always /encrypted. It can be variable and use default value if not set.
There was a problem hiding this comment.
@sidorovdmitry
it's just an example script (example_multitenant_update_theme.sh)
| echo "" | ||
| else | ||
| $THEMEX_SCRIPT_DIR/update_theme.sh -brhim marvel-yellow-theme-eucalyptus https://github.com/raccoongang/themes_for_themex.io.git all_host_edx $CONFIGURATION_PLAYBOOKS_DIR/hosts $CONFIGURATION_PLAYBOOKS_DIR/server-vars.yml | ||
| fi |
There was a problem hiding this comment.
Why https://github.com/raccoongang/themes_for_themex.io.git ? Move it to variables
There was a problem hiding this comment.
@sidorovdmitry
it's just an example script (example_multitenant_update_theme.sh)
| set_fact: | ||
| server_vars_path: "{{ MULTITENANT_SERVER_VARS }}" | ||
| when: MULTITENANT_SERVER_VARS is defined | ||
|
|
There was a problem hiding this comment.
Why do we need 2 equal variables?
There was a problem hiding this comment.
@sidorovdmitry
because of playbook multifunctionality. We cannot use server_vars_path variable here
| @@ -51,10 +61,11 @@ | |||
| - role: branch | |||
| theme_branch: "{{ theme_branch }}" | |||
| theme_repo: "{{ theme_repo }}" | |||
| when: (("{{ script_mode }}" == 'br') or ("{{ script_mode }}" == 'brh') or ("{{ script_mode }}" == 'brhi')) and (script_mode is defined) and (theme_branch is defined) and (theme_repo is defined) | |||
| when: (("{{ script_mode }}" == 'br') or ("{{ script_mode }}" == 'brh') or ("{{ script_mode }}" == 'brhi') or ("{{ script_mode }}" == 'brhim')) and (script_mode is defined) and (theme_branch is defined) and (theme_repo is defined) | |||
There was a problem hiding this comment.
theme_branch: "{{ theme_branch|default('master') }}"
theme_repo: "{{ theme_repo|default( some our theme repo ) }}"```
when: script_mode is defined and script_mode in 'brhim' ?
There was a problem hiding this comment.
@sidorovdmitry updated with defaults
when: script_mode is defined and script_mode in 'brhim' ? - not applicable (f.e. 'him' in 'brhim' is True but not supported mode)
|
|
||
| - name: Ensure that server-vars contain EDXAPP_COMPREHENSIVE_THEME_DIR for MULTITENANT_SERVER_VARS_LOCAL_LOCATION | ||
| local_action: lineinfile dest="{{ server_vars_path }}" | ||
| regexp='^EDXAPP_COMPREHENSIVE_THEME_DIR:' |
There was a problem hiding this comment.
@sidorovdmitry fixed
dgamanenko
force-pushed
the
scout
branch
3 times, most recently
from
4b4bbe2
to
92034a2
Compare
|
@sidorovdmitry all issues are fixed |
dgamanenko
force-pushed
the
scout
branch
2 times, most recently
from
7c5b07f
to
119cffa
Compare
@sidorovdmitry
@imatviian
please review