Openstack Mojo Testing

Merge lp:~thedac/openstack-mojo-specs/mojo-openstack-specs-1709-bugs into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

  1. mojo-openstack-specs-1709-bugs
  2. Merge into mojo-openstack-specs-1709
Proposed by David Ames
Status: Merged
Merged at revision: 332
Proposed branch: lp:~thedac/openstack-mojo-specs/mojo-openstack-specs-1709-bugs
Merge into: lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709
Diff against target: 133 lines (+3/-46)
9 files modified
helper/setup/upgrade_openstack.py (+1/-4)
helper/utils/os_versions.py (+2/-0)
specs/storage/ceph/radosgw_ha/icehouse/manifest (+0/-6)
specs/storage/ceph/radosgw_ha/kilo/manifest (+0/-6)
specs/storage/ceph/radosgw_ha/liberty/manifest (+0/-6)
specs/storage/ceph/radosgw_ha/mitaka/manifest (+0/-6)
specs/storage/ceph/radosgw_ha/newton/manifest (+0/-6)
specs/storage/ceph/radosgw_ha/ocata/manifest (+0/-6)
specs/storage/ceph/radosgw_ha/pike/manifest (+0/-6)
To merge this branch: bzr merge lp:~thedac/openstack-mojo-specs/mojo-openstack-specs-1709-bugs
Reviewer Review Type Date Requested Status
Andrew McLeod (community) Approve
OpenStack Charm Testing Maintainers Pending
Review via email: mp+330312@code.launchpad.net

Description of the change

Fix openstack upgrade bug

ceph-radosgw no longer uses apache as a front end.

To post a comment you must log in.
Revision history for this message
Andrew McLeod (admcleod) wrote :

lgtm +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'helper/setup/upgrade_openstack.py'
--- helper/setup/upgrade_openstack.py 2017-08-30 17:25:03 +0000
+++ helper/setup/upgrade_openstack.py 2017-09-06 18:59:13 +0000
@@ -166,10 +166,7 @@
166 ubuntu_version, target_release166 ubuntu_version, target_release
167 )167 )
168 mojo_utils.juju_set(service['name'], option, wait=False)168 mojo_utils.juju_set(service['name'], option, wait=False)
169 mojo_utils.juju_status_check_and_wait()169 mojo_utils.juju_wait_finished()
170 svc_units = mojo_utils.get_juju_units(service=service['name'])
171 mojo_utils.remote_runs(svc_units)
172 mojo_utils.juju_status_check_and_wait()
173170
174171
175if __name__ == "__main__":172if __name__ == "__main__":
176173
=== modified file 'helper/utils/os_versions.py'
--- helper/utils/os_versions.py 2017-08-30 17:25:03 +0000
+++ helper/utils/os_versions.py 2017-09-06 18:59:13 +0000
@@ -31,6 +31,8 @@
31 ('2016.1', 'mitaka'),31 ('2016.1', 'mitaka'),
32 ('2016.2', 'newton'),32 ('2016.2', 'newton'),
33 ('2017.1', 'ocata'),33 ('2017.1', 'ocata'),
34 ('2017.2', 'pike'),
35 ('2018.1', 'queens'),
34])36])
3537
3638
3739
=== modified file 'specs/storage/ceph/radosgw_ha/icehouse/manifest'
--- specs/storage/ceph/radosgw_ha/icehouse/manifest 2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw_ha/icehouse/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success
3529
=== modified file 'specs/storage/ceph/radosgw_ha/kilo/manifest'
--- specs/storage/ceph/radosgw_ha/kilo/manifest 2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw_ha/kilo/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success
3529
=== modified file 'specs/storage/ceph/radosgw_ha/liberty/manifest'
--- specs/storage/ceph/radosgw_ha/liberty/manifest 2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw_ha/liberty/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success
3529
=== modified file 'specs/storage/ceph/radosgw_ha/mitaka/manifest'
--- specs/storage/ceph/radosgw_ha/mitaka/manifest 2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw_ha/mitaka/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success
3529
=== modified file 'specs/storage/ceph/radosgw_ha/newton/manifest'
--- specs/storage/ceph/radosgw_ha/newton/manifest 2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw_ha/newton/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success
3529
=== modified file 'specs/storage/ceph/radosgw_ha/ocata/manifest'
--- specs/storage/ceph/radosgw_ha/ocata/manifest 2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw_ha/ocata/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success
3529
=== modified file 'specs/storage/ceph/radosgw_ha/pike/manifest'
--- specs/storage/ceph/radosgw_ha/pike/manifest 2017-08-30 19:34:23 +0000
+++ specs/storage/ceph/radosgw_ha/pike/manifest 2017-09-06 18:59:13 +0000
@@ -25,10 +25,4 @@
25# Test obj store by sending and recieving files25# Test obj store by sending and recieving files
26verify config=test_obj_store.py26verify config=test_obj_store.py
2727
28# Switch to using the ceph-radosgw embedded webserver
29script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
30
31# Test obj store by sending and recieving files
32verify config=test_obj_store.py
33
34# Success28# Success

Subscribers

People subscribed via source and target branches