Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
99d040a1
Commit
99d040a1
authored
Mar 16, 2016
by
Kevin Falcone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Discovery was missed during the initial ansible work
This let a machine boot without migrations running.
parent
6e9ae48d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletions
+19
-1
playbooks/roles/supervisor/files/pre_supervisor_checks.py
+11
-0
playbooks/roles/supervisor/templates/etc/init/pre_supervisor.conf.j2
+8
-1
No files found.
playbooks/roles/supervisor/files/pre_supervisor_checks.py
View file @
99d040a1
...
...
@@ -19,6 +19,7 @@ MIGRATION_COMMANDS = {
'insights'
:
". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list"
,
'analytics_api'
:
". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list"
,
'credentials'
:
". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list"
,
'discovery'
:
". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list"
,
}
HIPCHAT_USER
=
"PreSupervisor"
...
...
@@ -111,6 +112,15 @@ if __name__ == '__main__':
credentials_migration_args
.
add_argument
(
"--credentials-code-dir"
,
help
=
"Location to of the credentials code."
)
discovery_migration_args
=
parser
.
add_argument_group
(
"discovery_migrations"
,
"Args for running discovery migration checks."
)
discovery_migration_args
.
add_argument
(
"--discovery-python"
,
help
=
"Path to python to use for executing migration check."
)
discovery_migration_args
.
add_argument
(
"--discovery-env"
,
help
=
"Location of the discovery environment file."
)
discovery_migration_args
.
add_argument
(
"--discovery-code-dir"
,
help
=
"Location to of the discovery code."
)
insights_migration_args
=
parser
.
add_argument_group
(
"insights_migrations"
,
"Args for running insights migration checks."
)
insights_migration_args
.
add_argument
(
"--insights-python"
,
...
...
@@ -233,6 +243,7 @@ if __name__ == '__main__':
"ecommerce"
:
{
'python'
:
args
.
ecommerce_python
,
'env_file'
:
args
.
ecommerce_env
,
'code_dir'
:
args
.
ecommerce_code_dir
},
"programs"
:
{
'python'
:
args
.
programs_python
,
'env_file'
:
args
.
programs_env
,
'code_dir'
:
args
.
programs_code_dir
},
"credentials"
:
{
'python'
:
args
.
credentials_python
,
'env_file'
:
args
.
credentials_env
,
'code_dir'
:
args
.
credentials_code_dir
},
"discovery"
:
{
'python'
:
args
.
discovery_python
,
'env_file'
:
args
.
discovery_env
,
'code_dir'
:
args
.
discovery_code_dir
},
"insights"
:
{
'python'
:
args
.
insights_python
,
'env_file'
:
args
.
insights_env
,
'code_dir'
:
args
.
insights_code_dir
},
"analytics_api"
:
{
'python'
:
args
.
analytics_api_python
,
'env_file'
:
args
.
analytics_api_env
,
'code_dir'
:
args
.
analytics_api_code_dir
}
}
...
...
playbooks/roles/supervisor/templates/etc/init/pre_supervisor.conf.j2
View file @
99d040a1
...
...
@@ -17,4 +17,11 @@ setuid {{ supervisor_user }}
{% set credentials_command = "" %}
{% endif %}
exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }} --edxapp-env {{ edxapp_app_dir }}/edxapp_env{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %} {% if ecommerce_code_dir is defined %}--ecommerce-env {{ ecommerce_home }}/ecommerce_env --ecommerce-code-dir {{ ecommerce_code_dir }} --ecommerce-python {{ COMMON_BIN_DIR }}/python.ecommerce {% endif %} {% if insights_code_dir is defined %}--insights-env {{ insights_home }}/insights_env --insights-code-dir {{ insights_code_dir }} --insights-python {{ COMMON_BIN_DIR }}/python.insights {% endif %} {% if analytics_api_code_dir is defined %}--analytics-api-env {{ analytics_api_home }}/analytics_api_env --analytics-api-code-dir {{ analytics_api_code_dir }} --analytics-api-python {{ COMMON_BIN_DIR }}/python.analytics_api {% endif %} {{ programs_command }} {{ credentials_command }}
{% if discovery_code_dir is defined %}
{% set discovery_command = "--discovery-env " + discovery_home + "/discovery_env --discovery-code-dir " + discovery_code_dir + " --discovery-python " + COMMON_BIN_DIR + "/python.discovery" %}
{% else %}
{% set discovery_command = "" %}
{% endif %}
exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }} --edxapp-env {{ edxapp_app_dir }}/edxapp_env{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %} {% if ecommerce_code_dir is defined %}--ecommerce-env {{ ecommerce_home }}/ecommerce_env --ecommerce-code-dir {{ ecommerce_code_dir }} --ecommerce-python {{ COMMON_BIN_DIR }}/python.ecommerce {% endif %} {% if insights_code_dir is defined %}--insights-env {{ insights_home }}/insights_env --insights-code-dir {{ insights_code_dir }} --insights-python {{ COMMON_BIN_DIR }}/python.insights {% endif %} {% if analytics_api_code_dir is defined %}--analytics-api-env {{ analytics_api_home }}/analytics_api_env --analytics-api-code-dir {{ analytics_api_code_dir }} --analytics-api-python {{ COMMON_BIN_DIR }}/python.analytics_api {% endif %} {{ programs_command }} {{ discovery_command }} {{ credentials_command }}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment