Merge lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka into lp://staging/openstack-mojo-specs

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 271
Proposed branch: lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka
Merge into: lp://staging/openstack-mojo-specs
Diff against target: 929 lines (+478/-1)
30 files modified
helper/bundles/cephradosgw-ha.yaml (+11/-0)
helper/bundles/cephradosgw.yaml (+15/-0)
helper/bundles/swift-ha-proxy-phase1.yaml (+14/-0)
helper/bundles/swift-ha-proxy-phase2.yaml (+11/-0)
helper/bundles/swift-proxy.yaml (+9/-0)
helper/collect/collect-cephradosgw (+2/-0)
helper/collect/collect-swift-proxy (+1/-1)
helper/setup/delete_crm_leader.py (+7/-0)
specs/object_storage/ceph_radosgw/ha/liberty/SPEC_INFO.txt (+3/-0)
specs/object_storage/ceph_radosgw/ha/liberty/manifest (+34/-0)
specs/object_storage/ceph_radosgw/ha/mitaka/SPEC_INFO.txt (+3/-0)
specs/object_storage/ceph_radosgw/ha/mitaka/manifest (+34/-0)
specs/object_storage/ceph_radosgw/simple_nonha/liberty/SPEC_INFO.txt (+3/-0)
specs/object_storage/ceph_radosgw/simple_nonha/liberty/manifest (+19/-0)
specs/object_storage/ceph_radosgw/simple_nonha/mitaka/SPEC_INFO.txt (+3/-0)
specs/object_storage/ceph_radosgw/simple_nonha/mitaka/manifest (+19/-0)
specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/SPEC_INFO.txt (+5/-0)
specs/object_storage/swift_proxy/ha_parallel_scaleout/kilo/manifest (+39/-0)
specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/SPEC_INFO.txt (+5/-0)
specs/object_storage/swift_proxy/ha_parallel_scaleout/liberty/manifest (+39/-0)
specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/SPEC_INFO.txt (+5/-0)
specs/object_storage/swift_proxy/ha_parallel_scaleout/mitaka/manifest (+39/-0)
specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/SPEC_INFO.txt (+3/-0)
specs/object_storage/swift_proxy/ha_serial_scaleout/liberty/manifest (+52/-0)
specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/SPEC_INFO.txt (+3/-0)
specs/object_storage/swift_proxy/ha_serial_scaleout/mitaka/manifest (+52/-0)
specs/object_storage/swift_proxy/simple_nonha/liberty/SPEC_INFO.txt (+2/-0)
specs/object_storage/swift_proxy/simple_nonha/liberty/manifest (+22/-0)
specs/object_storage/swift_proxy/simple_nonha/mitaka/SPEC_INFO.txt (+2/-0)
specs/object_storage/swift_proxy/simple_nonha/mitaka/manifest (+22/-0)
To merge this branch: bzr merge lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
David Ames (community) Approve
Review via email: mp+300766@code.staging.launchpad.net
To post a comment you must log in.
271. By Chris MacNaughton

update radosgw bundles

272. By Chris MacNaughton

Update non-working swift-ha-parallel spec

273. By Chris MacNaughton

update the rest of the object_storage specs to have liberty + mitaka

274. By Chris MacNaughton

add more updated specs

- swift-proxy/ha/mitaka
- radosgw/ha/liberty
- radosgw/ha/mitaka

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Please see inline comment re: series.

Also, some minor lint to clean up:

checking helper/setup/delete_crm_leader.py
helper/setup/delete_crm_leader.py:19:5: E101 indentation contains mixed spaces and tabs
helper/setup/delete_crm_leader.py:19:5: W191 indentation contains tabs

review: Needs Fixing
275. By Chris MacNaughton

Update to check version numbers

This does not use lsb-release because
lsb-release does NOT convert general release
names into numbers, rather it gives the currently
running release name and version number

276. By Chris MacNaughton

switch to distro_info

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Please run `make lint` and clear up any issues.

review: Needs Fixing
Revision history for this message
Ryan Beisner (1chb1n) wrote :

I'm seeing:

helper/setup/delete_crm_leader.py:6:1: F401 'ubuntu_version' imported but unused
helper/setup/delete_crm_leader.py:19:14: F821 undefined name 'distro_info'
helper/setup/delete_crm_leader.py:20:16: F821 undefined name 'distro_info'
helper/setup/delete_crm_leader.py:20:80: E501 line too long (86 > 79 characters)

277. By Chris MacNaughton

lint fixes

278. By Chris MacNaughton

remove spurious print statement

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

Works for me. We may need to look at other specs for issues with Xenial interface names.

review: Approve
Revision history for this message
Ryan Beisner (1chb1n) :
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