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
1=== modified file 'helper/setup/upgrade_openstack.py'
2--- helper/setup/upgrade_openstack.py 2017-08-30 17:25:03 +0000
3+++ helper/setup/upgrade_openstack.py 2017-09-06 18:59:13 +0000
4@@ -166,10 +166,7 @@
5 ubuntu_version, target_release
6 )
7 mojo_utils.juju_set(service['name'], option, wait=False)
8- mojo_utils.juju_status_check_and_wait()
9- svc_units = mojo_utils.get_juju_units(service=service['name'])
10- mojo_utils.remote_runs(svc_units)
11- mojo_utils.juju_status_check_and_wait()
12+ mojo_utils.juju_wait_finished()
13
14
15 if __name__ == "__main__":
16
17=== modified file 'helper/utils/os_versions.py'
18--- helper/utils/os_versions.py 2017-08-30 17:25:03 +0000
19+++ helper/utils/os_versions.py 2017-09-06 18:59:13 +0000
20@@ -31,6 +31,8 @@
21 ('2016.1', 'mitaka'),
22 ('2016.2', 'newton'),
23 ('2017.1', 'ocata'),
24+ ('2017.2', 'pike'),
25+ ('2018.1', 'queens'),
26 ])
27
28
29
30=== modified file 'specs/storage/ceph/radosgw_ha/icehouse/manifest'
31--- specs/storage/ceph/radosgw_ha/icehouse/manifest 2017-02-22 14:27:58 +0000
32+++ specs/storage/ceph/radosgw_ha/icehouse/manifest 2017-09-06 18:59:13 +0000
33@@ -25,10 +25,4 @@
34 # Test obj store by sending and recieving files
35 verify config=test_obj_store.py
36
37-# Switch to using the ceph-radosgw embedded webserver
38-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
39-
40-# Test obj store by sending and recieving files
41-verify config=test_obj_store.py
42-
43 # Success
44
45=== modified file 'specs/storage/ceph/radosgw_ha/kilo/manifest'
46--- specs/storage/ceph/radosgw_ha/kilo/manifest 2017-02-22 14:27:58 +0000
47+++ specs/storage/ceph/radosgw_ha/kilo/manifest 2017-09-06 18:59:13 +0000
48@@ -25,10 +25,4 @@
49 # Test obj store by sending and recieving files
50 verify config=test_obj_store.py
51
52-# Switch to using the ceph-radosgw embedded webserver
53-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
54-
55-# Test obj store by sending and recieving files
56-verify config=test_obj_store.py
57-
58 # Success
59
60=== modified file 'specs/storage/ceph/radosgw_ha/liberty/manifest'
61--- specs/storage/ceph/radosgw_ha/liberty/manifest 2017-02-22 14:27:58 +0000
62+++ specs/storage/ceph/radosgw_ha/liberty/manifest 2017-09-06 18:59:13 +0000
63@@ -25,10 +25,4 @@
64 # Test obj store by sending and recieving files
65 verify config=test_obj_store.py
66
67-# Switch to using the ceph-radosgw embedded webserver
68-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
69-
70-# Test obj store by sending and recieving files
71-verify config=test_obj_store.py
72-
73 # Success
74
75=== modified file 'specs/storage/ceph/radosgw_ha/mitaka/manifest'
76--- specs/storage/ceph/radosgw_ha/mitaka/manifest 2017-02-22 14:27:58 +0000
77+++ specs/storage/ceph/radosgw_ha/mitaka/manifest 2017-09-06 18:59:13 +0000
78@@ -25,10 +25,4 @@
79 # Test obj store by sending and recieving files
80 verify config=test_obj_store.py
81
82-# Switch to using the ceph-radosgw embedded webserver
83-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
84-
85-# Test obj store by sending and recieving files
86-verify config=test_obj_store.py
87-
88 # Success
89
90=== modified file 'specs/storage/ceph/radosgw_ha/newton/manifest'
91--- specs/storage/ceph/radosgw_ha/newton/manifest 2017-02-22 14:27:58 +0000
92+++ specs/storage/ceph/radosgw_ha/newton/manifest 2017-09-06 18:59:13 +0000
93@@ -25,10 +25,4 @@
94 # Test obj store by sending and recieving files
95 verify config=test_obj_store.py
96
97-# Switch to using the ceph-radosgw embedded webserver
98-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
99-
100-# Test obj store by sending and recieving files
101-verify config=test_obj_store.py
102-
103 # Success
104
105=== modified file 'specs/storage/ceph/radosgw_ha/ocata/manifest'
106--- specs/storage/ceph/radosgw_ha/ocata/manifest 2017-02-22 14:27:58 +0000
107+++ specs/storage/ceph/radosgw_ha/ocata/manifest 2017-09-06 18:59:13 +0000
108@@ -25,10 +25,4 @@
109 # Test obj store by sending and recieving files
110 verify config=test_obj_store.py
111
112-# Switch to using the ceph-radosgw embedded webserver
113-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
114-
115-# Test obj store by sending and recieving files
116-verify config=test_obj_store.py
117-
118 # Success
119
120=== modified file 'specs/storage/ceph/radosgw_ha/pike/manifest'
121--- specs/storage/ceph/radosgw_ha/pike/manifest 2017-08-30 19:34:23 +0000
122+++ specs/storage/ceph/radosgw_ha/pike/manifest 2017-09-06 18:59:13 +0000
123@@ -25,10 +25,4 @@
124 # Test obj store by sending and recieving files
125 verify config=test_obj_store.py
126
127-# Switch to using the ceph-radosgw embedded webserver
128-script config=juju_set.py SERVICE="ceph-radosgw" KV="use-embedded-webserver=True"
129-
130-# Test obj store by sending and recieving files
131-verify config=test_obj_store.py
132-
133 # Success

Subscribers

People subscribed via source and target branches