Ubuntu CI Engine

Merge lp://qastaging/~doanac/uci-engine/ticket-system-amqp into lp://qastaging/uci-engine

  1. ticket-system-amqp
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 490
Merged at revision: 494
Proposed branch: lp://qastaging/~doanac/uci-engine/ticket-system-amqp
Merge into: lp://qastaging/uci-engine
Diff against target: 122 lines (+55/-1)
4 files modified
charms/precise/python-django/config.yaml (+10/-0)
charms/precise/python-django/hooks/hooks.py (+35/-0)
charms/precise/python-django/metadata.yaml (+3/-0)
juju-deployer/ticket-system.yaml.tmpl (+7/-1)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/ticket-system-amqp
Reviewer Review Type Date Requested Status
Paul Larson Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+219886@code.qastaging.launchpad.net

Commit message

django charm: add relationship support for rabbitmq

This lets you add a relation between rabbitmq and django like we
do in our rabbitmq-worker charm. This allows the ticket system to use rabbit

Description of the change

The ticket system / lander are going to be converted to communicate via rabbit instead of the lander polling for tickets. This will bring about several benefits, the main being we'll support multiple landers.

This is the first step in the process - updating our charm to allow a rabbit relationship.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:490
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/648/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/648/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paul Larson (pwlars) wrote :

Looks good, just one question...
50 + f.write('# DO NOT EDIT. Generated by rabbitmq-worker charm hook\n')
51 + f.write('AMQP_USER = "%s"\n' % config_data['amqp-user'])
52 + f.write('AMQP_VHOST = "%s"\n' % config_data['amqp-vhost'])
53 + f.write('AMQP_HOST = "%s"\n' % relation_get('private-address'))
54 + f.write('AMQP_PASSWORD = "%s"\n' % relation_get('password'))
I guess it's not possible to get the user and vhost from the relation config?

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

On 05/16/2014 01:30 PM, Paul Larson wrote:
> I guess it's not possible to get the user and vhost from the relation config?

nope - Its totally annoying. We pass around the same default user/vhost
to every service we deploy.

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