simplestreams

Merge lp://qastaging/~thedac/simplestreams/lp1611987 into lp://qastaging/simplestreams

  1. lp1611987
  2. Merge into trunk
Proposed by David Ames
Status: Merged
Merged at revision: 460
Proposed branch: lp://qastaging/~thedac/simplestreams/lp1611987
Merge into: lp://qastaging/simplestreams
Diff against target: 13 lines (+2/-1)
1 file modified
simplestreams/openstack.py (+2/-1)
To merge this branch: bzr merge lp://qastaging/~thedac/simplestreams/lp1611987
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
simplestreams-dev Pending
Review via email: mp+342971@code.qastaging.launchpad.net

Commit message

Handle Keystone V2 but session based authentication

Description of the change

There are three cases we have to handle

keystone v2 without sessions
keystone v2 with sessions
keystone v3 with sessions

We had the first and the last covered but not the middle. This change addresses this.

If we can get this change put into the ppa:smoser/sstream-ks3 PPA even before merging we can run a suit of tests against all three relatively quickly.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:460
https://jenkins.ubuntu.com/server/job/simplestreams-ci/53/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/53
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/53
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/53
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/53

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/53/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Ames (thedac) wrote :

Hang on this might not be sufficient yet. Testing still

Revision history for this message
David Ames (thedac) wrote :

When using my fix in the MP and ppa:smoser/sstream-ks3 version 0.1.0~bzr426-0ubuntu1.3~ppa0

I get the following error that is unrelated to my change. This seems to be a missing commit in the ppa:smoser/sstream-ks3 version.

Traceback (most recent call last):
  File "/usr/share/glance-simplestreams-sync/glance-simplestreams-sync.py", line 473, in main
    do_sync(charm_conf, status_exchange)
  File "/usr/share/glance-simplestreams-sync/glance-simplestreams-sync.py", line 246, in do_sync
    tmirror.sync(smirror, path=initial_path)
  File "/usr/lib/python2.7/dist-packages/simplestreams/mirrors/__init__.py", line 91, in sync
    return self.sync_index(reader, path, data, content)
  File "/usr/lib/python2.7/dist-packages/simplestreams/mirrors/__init__.py", line 254, in sync_index
    self.sync(reader, path=epath)
  File "/usr/lib/python2.7/dist-packages/simplestreams/mirrors/__init__.py", line 89, in sync
    return self.sync_products(reader, path, data, content)
  File "/usr/lib/python2.7/dist-packages/simplestreams/mirrors/__init__.py", line 346, in sync_products
    (prodname, vername))
  File "/usr/lib/python2.7/dist-packages/simplestreams/mirrors/glance.py", line 368, in insert_version
    self._insert_item(*iargs)

Sure enough _insert_item does not exist in this version although it does exist in tip of lp:simplestreams.

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

to all changes: