Merge lp:~james-w/python-oops-tools/prod-deploy into lp:python-oops-tools
Proposed by
James Westby
Status: | Merged |
---|---|
Approved by: | James Westby |
Approved revision: | 54 |
Merged at revision: | 53 |
Proposed branch: | lp:~james-w/python-oops-tools/prod-deploy |
Merge into: | lp:python-oops-tools |
Diff against target: |
101 lines (+22/-4) 5 files modified
buildout-templates/src/oopstools/settings.py.in (+14/-1) production.cfg.example (+2/-1) setup.py (+2/-0) src/oopstools/urls.py (+3/-2) versions.cfg (+1/-0) |
To merge this branch: | bzr merge lp:~james-w/python-oops-tools/prod-deploy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Albisetti (community) | Approve | ||
Review via email: mp+138571@code.launchpad.net |
Commit message
Add django_openid_auth.
Our production deployment hacks things such that django_openid_auth is used.
This adds it for real.
In addition it adds the common pattern of allowing a local_settings.py
that overrides values in settings.py so that prod can configure things like
the SSO server and the team mappings.
Description of the change
Hi,
This is a step towards cleaning up the prod deploy.
Currently prod runs non-trunk code as it changes a couple of files
to add openid support.
This branch adds the basic support for openid, and allows for configuration
in prod without having to change versioned files. The commit message
has more rationale about the individual changes.
Thanks,
James
To post a comment you must log in.
The attempt to merge lp:~james-w/python-oops-tools/prod-deploy into lp:python-oops-tools failed.Below is the output from the failed tests.
find . -type f -name '*.py[co]' -exec rm -f {} \; settings. py source= download- cache/ez_ setup.py \ base=download- cache/dist --eggs=eggs pqm/pqm- workdir/oops-tools/bin/buildout'. db-port= 5433 pqm/pqm- workdir/oops-tools/.' openid- auth' (maybe misspelled?) openid- auth==0. 4'.
rm -f bin/buildout
rm -f src/oopstools/
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
--setup-
--download-
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/
bin/buildout configuration:
Develop: '/home/
Couldn't find index page for 'django-
Getting distribution for 'django-
W: line 4 [buildbot-staging]: Deprecated key 'location' used pqm-workdir/oops-tools && make check" bazaar. launchpad. net/~launchpad/ lp-source- dependencies/ trunk openid- auth==0. 4'. openid- auth==0. 4'.
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/
Nothing to delete.
Tree is up to date at revision 533 of branch http://
While:
Installing.
Getting section filetemplates.
Initializing part filetemplates.
Getting distribution for 'django-
Error: Couldn't find a distribution for 'django-
make: *** [bin/buildout] Error 1