Ubuntu CI Services

Merge lp://staging/~doanac/ubuntu-ci-services-itself/ticket-system-charm into lp://staging/ubuntu-ci-services-itself

  1. ticket-system-charm
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 31
Merged at revision: 32
Proposed branch: lp://staging/~doanac/ubuntu-ci-services-itself/ticket-system-charm
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 54 lines (+37/-0)
2 files modified
juju-deployer/ticket_system.yaml (+27/-0)
ticket_system/ticket_system/settings.py (+10/-0)
To merge this branch: bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/ticket-system-charm
Reviewer Review Type Date Requested Status
Evan (community) Approve
Review via email: mp+198823@code.staging.launchpad.net

Commit message

make the ticket-system deployable via django charm

Description of the change

make the ticket-system deployable via the django charm

NOTE: juju-deployer/ticket_system.yaml won't work until *after* this has been merged. To test this locally you'll need to point it to this branch. ie:

 --- ./juju-deployer/ticket_system.yaml 2013-12-12 13:17:20.250225711 -0600
+++ /tmp/ticket_system.yaml 2013-12-12 13:17:08.694168416 -0600
@@ -6,7 +6,7 @@
             branch: lp:~canonical-ci-engineering/charms/precise/python-django/ci-services
             options:
                 vcs: bzr
- repos_url: lp:ubuntu-ci-services-itself
+ repos_url: lp:~doanac/ubuntu-ci-services-itself/ticket-system-charm
                 additional_distro_packages: python-mock
                 additional_pip_packages: django-tastypie==0.9.15
                 application_path: ticket_system/

There is also a bug in the django charm itself. It needs to automatically creat a settings file for ALLOWED_HOSTS. I'll fix that up today.

To post a comment you must log in.
lp://staging/~doanac/ubuntu-ci-services-itself/ticket-system-charm updated
31. By Andy Doan

allow django debugging in our staging instance

Revision history for this message
Andy Doan (doanac) wrote :

NOTE: ALLOWED_HOSTS is now fixed in the Django charm. It also handles a DEBUG setting for the service. I've enabled DEBUG in our staging charm.

Revision history for this message
Evan (ev) wrote :

I'm assuming pulling in the juju settings via a relative import wouldn't work? Otherwise looks good.

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

On 12/13/2013 08:03 AM, Evan Dandrea wrote:
> I'm assuming pulling in the juju settings via a relative import wouldn't work?

Yeah, the python-django charm puts them in the root directory of the
project which we don't have under PYTHONPATH.

Revision history for this message
Evan (ev) wrote :

+1 then

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches