Bug 1318021 - Vagrant: Remove support for settings_local.py

Since it is footgun-prone, discourages upstreaming of useful development
tricks & is unnecessary in an environment variable centric world.

The one remaining `BZ_API_URL` setting isn't actively used, and if this
changes in the future, it should be set via an environment variable
instead.
This commit is contained in:
Ed Morley 2016-11-26 12:32:37 +00:00
Родитель 608687da92
Коммит 5dfb9782a2
6 изменённых файлов: 1 добавлений и 28 удалений

Просмотреть файл

@ -6,5 +6,3 @@ omit =
*/migrations/*
treeherder/config/wsgi.py
treeherder/config/settings.py
treeherder/config/settings_local.py
treeherder/config/settings_local.example.py

1
.gitignore поставляемый
Просмотреть файл

@ -22,7 +22,6 @@ node_modules/
deployment/update/commander_settings.py
dist/
docs/_build/
treeherder/config/settings_local.py
treeherder/media/
treeherder/static/
treeherder/webapp/log_cache/

Просмотреть файл

@ -10,8 +10,7 @@ posting your own data.
Configuration
-------------
To specify the exchanges to read from, you can set environment variables in
Vagrant, or in your ``config/settings_local.py`` file. For example::
Specify the exchanges to read from using environment variables. For example::
PULSE_DATA_INGESTION_SOURCES = [
{

Просмотреть файл

@ -16,11 +16,6 @@ file {"/etc/profile.d/treeherder.sh":
target => "${PROJ_DIR}/puppet/files/treeherder/env.sh",
}
file {"${PROJ_DIR}/treeherder/config/settings_local.py":
replace => "no",
source => "${PROJ_DIR}/treeherder/config/settings_local.example.py",
}
class vagrant {
class {
init: before => Class["mysql"];

Просмотреть файл

@ -453,8 +453,6 @@ PULSE_EXCHANGE_NAMESPACE = env("PULSE_EXCHANGE_NAMESPACE", default=None)
# Specifies the Pulse exchanges Treeherder will ingest data from. This list
# will be updated as new applications come online that Treeherder supports.
# Can be overridden in settings_local.py to specify fewer or completely different
# exchanges for testing purposes on local machines.
# Treeherder will subscribe with routing keys that are all combinations of
# ``project`` and ``destination`` in the form of:
# <destination>.<project>
@ -528,19 +526,6 @@ PULSE_DATA_INGESTION_QUEUES_AUTO_DELETE = False
GITHUB_CLIENT_ID = env("GITHUB_CLIENT_ID", default=None)
GITHUB_CLIENT_SECRET = env("GITHUB_CLIENT_SECRET", default=None)
# The git-ignored settings_local.py file should only be used for local development.
if env.bool("ENABLE_LOCAL_SETTINGS_FILE", default=False):
# Note: All the configs below this import will take precedence over what is
# defined in settings_local.py!
try:
assert "update" not in globals()
from .settings_local import *
if "update" in globals():
update(globals())
del globals()['update']
except ImportError:
pass
TEMPLATE_DEBUG = DEBUG
# The database config is defined using environment variables of form:

Просмотреть файл

@ -1,3 +0,0 @@
# Switch to using a different bugzilla instance
BZ_API_URL = "https://bugzilla-dev.allizom.org"