Skip to content

Commit 04da719

Browse files
authored
Merge pull request #555 from ucb-rit/develop
Fix connection to Oracle database for validating LBL billing IDs; improve dev environment performance
2 parents ea661b3 + 1909fd0 commit 04da719

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

bootstrap/ansible/playbook.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,22 @@
271271
environment: # needed as pg_config isn't in PATH by default
272272
PATH: "{{ ansible_env.PATH }}:/usr/pgsql-{{ postgres_version }}/bin"
273273

274+
- name: Add Oracle yum repository
275+
yum_repository:
276+
name: oracle-repository
277+
description: oracle repository
278+
baseurl: https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient21/x86_64/
279+
# https://linux.oracle.com/security/gpg/
280+
gpgkey: https://yum.oracle.com/RPM-GPG-KEY-oracle-ol7
281+
when: install_billing_validation_package
282+
283+
- name: Install Oracle dependency for Python package for validating LBL billing IDs
284+
yum:
285+
name:
286+
- oracle-instantclient-basic.x86_64
287+
state: present
288+
when: install_billing_validation_package
289+
274290
# TODO: If this raises an error, the token is exposed in stderr.
275291
- name: Install the Python package for validating LBL billing IDs
276292
pip:

bootstrap/ansible/settings_template.tmpl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,22 @@ if DEBUG:
162162
hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
163163
INTERNAL_IPS = [ip[: ip.rfind('.')] + '.1' for ip in ips] + ['10.0.2.2']
164164

165+
DISABLE_PANELS = {
166+
'debug_toolbar.panels.history.HistoryPanel',
167+
'debug_toolbar.panels.versions.VersionsPanel',
168+
'debug_toolbar.panels.timer.TimerPanel',
169+
'debug_toolbar.panels.settings.SettingsPanel',
170+
'debug_toolbar.panels.headers.HeadersPanel',
171+
'debug_toolbar.panels.request.RequestPanel',
172+
'debug_toolbar.panels.sql.SQLPanel',
173+
'debug_toolbar.panels.staticfiles.StaticFilesPanel',
174+
'debug_toolbar.panels.templates.TemplatesPanel',
175+
'debug_toolbar.panels.cache.CachePanel',
176+
'debug_toolbar.panels.signals.SignalsPanel',
177+
'debug_toolbar.panels.redirects.RedirectsPanel',
178+
'debug_toolbar.panels.profiling.ProfilingPanel',
179+
}
180+
165181
#------------------------------------------------------------------------------
166182
# django-flags settings
167183
#------------------------------------------------------------------------------

0 commit comments

Comments
 (0)