Juju Charms Collection
glance-simplestreams-sync package

Merge lp://qastaging/~danilo/charms/trusty/glance-simplestreams-sync/use-upstream-user-agent-support into lp://qastaging/~landscape/charms/trusty/glance-simplestreams-sync/landscape

  1. Trusty Tahr (14.04)
  2. use-upstream-user-agent-support
  3. Merge into landscape
Proposed by Данило Шеган
Status: Merged
Merged at revision: 64
Proposed branch: lp://qastaging/~danilo/charms/trusty/glance-simplestreams-sync/use-upstream-user-agent-support
Merge into: lp://qastaging/~landscape/charms/trusty/glance-simplestreams-sync/landscape
Diff against target: 175 lines (+5/-119)
1 file modified
scripts/glance-simplestreams-sync.py (+5/-119)
To merge this branch: bzr merge lp://qastaging/~danilo/charms/trusty/glance-simplestreams-sync/use-upstream-user-agent-support
Reviewer Review Type Date Requested Status
Bogdana Vereha (community) Approve
Geoff Teale (community) Approve
Review via email: mp+293110@code.qastaging.launchpad.net

Description of the change

Drop the monkey-patching approach and use the built-in user-agent support in python-simplestreams that's only available in a PPA (ppa:danilo/simplestreams for now, see https://code.launchpad.net/~danilo/simplestreams/custom-user-agent/+merge/292403).

Testing instructions:

1. Deploy OPL from lp:~danilo/landscape/gs3-simplestreams-from-ppa, enable openstack-image-refresh flag and deploy a cloud
2. Note how everything still works, and even user agent is passed on (I override mirror_list to point at a URL I control [run apache on], and watch for user agent strings)

Note: You'll have to deploy the glance-simplestreams-sync with source/key set (see MP above for https://code.launchpad.net/~danilo/landscape/gs3-simplestreams-from-ppa), since it does not reconfigure or apt update when set post installation.

To post a comment you must log in.
Revision history for this message
Geoff Teale (tealeg) wrote :

+1 Approve.

review: Approve
Revision history for this message
Bogdana Vereha (bogdana) wrote :

Looks good. +1

review: Approve
Revision history for this message
Данило Шеган (danilo) wrote :

Thanks for reviews, merged and published as cs:~landscape-charmers/trusty/glance-simplestreams-sync-6

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