lp:~larry-e-works/uci-engine/add_cloud_archive

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:uci-engine at revision 804

PS Jenkins bot (community): Approve (continuous-integration) on 2014-09-25

Evan (community): Approve on 2014-09-01

Francis Ginther: Needs Fixing on 2014-08-28

Diff: 270 lines (+61/-32)

15 files modified

charms/precise/lander/charm-helpers.yaml (+0/-8)
charms/precise/lander/config.yaml (+25/-4)
charms/precise/lander/hooks/hooks.py (+1/-4)
charms/precise/rabbitmq-worker/config.yaml (+7/-5)
juju-deployer/branch-source-builder.yaml.tmpl (+3/-1)
juju-deployer/gatekeeper.yaml.tmpl (+1/-1)
juju-deployer/image-builder.yaml.tmpl (+3/-1)
juju-deployer/lander.yaml.tmpl (+6/-1)
juju-deployer/nf-stats-service.yaml.tmpl (+1/-1)
juju-deployer/ppa-creator.yaml.tmpl (+3/-1)
juju-deployer/publisher.yaml.tmpl (+3/-1)
juju-deployer/test-runner.yaml.tmpl (+3/-1)
juju-deployer/ticket-system.yaml.tmpl (+1/-1)
juju-deployer/validator.yaml.tmpl (+3/-1)
juju-deployer/webui.yaml.tmpl (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

767. By Larry E Works on 2014-09-25

Re-merged from trunk, no conflicts.

766. By Larry E Works on 2014-09-23

Merged trunk, no conflicts

765. By Larry E Works on 2014-08-29

- Updated charms/precise/lander/config.yaml to add the install_sources/install_keys options.
- Updated charms/precise/lander/hooks/hooks.py to use fetch.configure_sources instead of looping through a ';' separated list of sources.
- Updated charms/precise/lander/charm-helpers.yaml to align it with the other charms.
- Updated juju-deployer/lander.yaml.tmpl to use install_sources and install_keys instead of sources; added the cloud archive source/key
- Updated remaining juju-deployer/*.tmpl files to use install_sources and install_keys for all sources instead of source/key for the cloud archive in all cases involving the rabbitmq-worker charm.
- Updated charms/precise/rabbitmq-worker/hooks/hooks.py to remove the add_source bits that are no longer being used.
- Updated charms/precise/rabbitmq-worker/config.yaml to remove the soure/key options
- Updated all of the config-manager.txt files to reflect revno 199 for charm-helpers. This was also done in lp:~larry-e-works/uci-engine/update-charmhelpers-revno but I failed to sync to that proposed branch prior to making these changes.

764. By Larry E Works on 2014-08-27

Added bits to the rabbitmq-worker/config.yaml that are needed to be able to specify source/key pairs as an option to add a repository during deployments.

Added bits to rabbitmq-worker/hooks/hooks.py to make use of the add_source method to add the cloud archive to the unit for later use for installing python-kombu

Added source: cloud:precise-icehouse and key: "" to all template files that use the rabbitmq-worker charm.

763. By Larry E Works on 2014-08-27

Updated conf/sourcedeps.conf to pin charm-helpers to revision number 199 (from revno 154).

762. By Joe Talbott on 2014-08-26

[r=Paul Larson, Ubuntu CI Bot, PS Jenkins bot, Francis Ginther] ticket-system - Add creator to tickets.

761. By Max Brustkern on 2014-08-22

[r=PS Jenkins bot, Francis Ginther] Move nfss insertion functionality into a packaged script.

760. By Celso Providelo on 2014-08-22

[r=Evan Dandrea, PS Jenkins bot] Allow the lander to store the ticket 'build_ppa' while completing the ppa-creation.

759. By Celso Providelo on 2014-08-21

[r=PS Jenkins bot, Ursula Junque] Adding Ticket.build_ppa field for storing the PPA reference (ppa:<lp_user>/<name>) where sources are built.

758. By Vincent Ladeuil on 2014-08-19

[r=Evan Dandrea, PS Jenkins bot] Handle nova transient failures by re-trying failed requests *once*.