Ubuntu CI Engine

Merge lp://staging/~psivaa/uci-engine/rabbitmq-restish-with-proxy into lp://staging/uci-engine/mthood

  1. rabbitmq-restish-with-proxy
  2. Merge into mthood
Proposed by Para Siva
Status: Merged
Merged at revision: 418
Proposed branch: lp://staging/~psivaa/uci-engine/rabbitmq-restish-with-proxy
Merge into: lp://staging/uci-engine/mthood
Diff against target: 262 lines (+105/-4)
9 files modified
charms/precise/rabbitmq-worker/config.yaml (+12/-0)
charms/precise/rabbitmq-worker/hooks/hooks.py (+37/-3)
charms/precise/restish/config.yaml (+8/-1)
charms/precise/restish/hooks/hooks.py (+29/-0)
juju-deployer/branch-source-builder.yaml.tmpl (+5/-0)
juju-deployer/deploy.py (+2/-0)
juju-deployer/image-builder.yaml.tmpl (+5/-0)
juju-deployer/lander.yaml.tmpl (+2/-0)
juju-deployer/test-runner.yaml.tmpl (+5/-0)
To merge this branch: bzr merge lp://staging/~psivaa/uci-engine/rabbitmq-restish-with-proxy
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Review via email: mp+220503@code.staging.launchpad.net

Commit message

Making rabbitmq and restish charm deployments with proxy. Should be similar changes to the lander-jenkins and python-django. Also contains change to the rabbitmq upstart job to include the proxy env variables.

Description of the change

Making rabbitmq and restish charm deployments with proxy. Spotting is not easy when the charm silently ignores packages listed in yaml for installation :/. Should be similar changes to the lander-jenkins and python-django. Also contains change to the rabbitmq upstart job to include the proxy env variables.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

one comment about the jinja stuff again

lp://staging/~psivaa/uci-engine/rabbitmq-restish-with-proxy updated
418. By Para Siva

Better conditional logic for private-public cloud in rabbitmq charm upstart job

419. By Para Siva

Adding no_proxy for the keystone, swift hosts

420. By Para Siva

no_proxy in deploy and yaml files

Revision history for this message
Para Siva (psivaa) wrote :

This could go in to mthood branch before parking that for a bit.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Thanks for the hard work, let's get that in.

review: Approve

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