Merge lp:~chris.macnaughton/openstack-mojo-specs/ceph into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

Proposed by Chris MacNaughton on 2017-08-31
Status: Rejected
Rejected by: Ryan Beisner on 2017-09-01
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/ceph
Merge into: lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709
Diff against target: 90 lines (+7/-7)
7 files modified
specs/storage/ceph/base/icehouse/manifest (+1/-1)
specs/storage/ceph/base/kilo/manifest (+1/-1)
specs/storage/ceph/base/liberty/manifest (+1/-1)
specs/storage/ceph/base/mitaka/manifest (+1/-1)
specs/storage/ceph/base/newton/manifest (+1/-1)
specs/storage/ceph/base/ocata/manifest (+1/-1)
specs/storage/ceph/base/pike/manifest (+1/-1)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/ceph
Reviewer Review Type Date Requested Status
Andrew McLeod Approve on 2017-09-01
OpenStack Charm Testing Maintainers 2017-08-31 Pending
Review via email: mp+330018@code.launchpad.net
To post a comment you must log in.
Andrew McLeod (admcleod) wrote :

I can see that ceph-default.yaml does not exist in this repo, but ceph-base.yaml does, so I'm giving this a +1 - although more info would be useful as to how this name ended up being wrong?

review: Approve

I suspect that it was missed when the entire directory structure changed, including the file being renamed from ceph-default.yaml to ceph-base.yaml

Ryan Beisner (1chb1n) wrote :

Thanks for your patch, but this is already resolved in a separate commit.

http://bazaar.launchpad.net/~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709/revision/311

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'specs/storage/ceph/base/icehouse/manifest'
2--- specs/storage/ceph/base/icehouse/manifest 2017-02-22 14:27:58 +0000
3+++ specs/storage/ceph/base/icehouse/manifest 2017-08-31 15:16:44 +0000
4@@ -2,7 +2,7 @@
5 collect config=collect-ceph-default
6
7 # Use juju deployer with ceph-default.yaml bundle
8-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
9+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
10
11 # Check juju statuses are green and that hooks have finished
12 verify config=check_juju.py
13
14=== modified file 'specs/storage/ceph/base/kilo/manifest'
15--- specs/storage/ceph/base/kilo/manifest 2017-02-22 14:27:58 +0000
16+++ specs/storage/ceph/base/kilo/manifest 2017-08-31 15:16:44 +0000
17@@ -2,7 +2,7 @@
18 collect config=collect-ceph-default
19
20 # Use juju deployer with ceph-default.yaml bundle
21-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
22+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
23
24 # Check juju statuses are green and that hooks have finished
25 verify config=check_juju.py
26
27=== modified file 'specs/storage/ceph/base/liberty/manifest'
28--- specs/storage/ceph/base/liberty/manifest 2017-02-22 14:27:58 +0000
29+++ specs/storage/ceph/base/liberty/manifest 2017-08-31 15:16:44 +0000
30@@ -2,7 +2,7 @@
31 collect config=collect-ceph-default
32
33 # Use juju deployer with ceph-default.yaml bundle
34-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
35+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
36
37 # Check juju statuses are green and that hooks have finished
38 verify config=check_juju.py
39
40=== modified file 'specs/storage/ceph/base/mitaka/manifest'
41--- specs/storage/ceph/base/mitaka/manifest 2017-02-22 14:27:58 +0000
42+++ specs/storage/ceph/base/mitaka/manifest 2017-08-31 15:16:44 +0000
43@@ -2,7 +2,7 @@
44 collect config=collect-ceph-default
45
46 # Use juju deployer with ceph-default.yaml bundle
47-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
48+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
49
50 # Check juju statuses are green and that hooks have finished
51 verify config=check_juju.py
52
53=== modified file 'specs/storage/ceph/base/newton/manifest'
54--- specs/storage/ceph/base/newton/manifest 2017-02-22 14:27:58 +0000
55+++ specs/storage/ceph/base/newton/manifest 2017-08-31 15:16:44 +0000
56@@ -2,7 +2,7 @@
57 collect config=collect-ceph-default
58
59 # Use juju deployer with ceph-default.yaml bundle
60-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
61+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
62
63 # Check juju statuses are green and that hooks have finished
64 verify config=check_juju.py
65
66=== modified file 'specs/storage/ceph/base/ocata/manifest'
67--- specs/storage/ceph/base/ocata/manifest 2017-08-30 17:25:03 +0000
68+++ specs/storage/ceph/base/ocata/manifest 2017-08-31 15:16:44 +0000
69@@ -2,7 +2,7 @@
70 collect config=collect-ceph-default
71
72 # Use juju deployer with ceph-default.yaml bundle
73-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
74+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
75
76 # Check juju statuses are green and that hooks have finished
77 verify config=check_juju.py
78
79=== modified file 'specs/storage/ceph/base/pike/manifest'
80--- specs/storage/ceph/base/pike/manifest 2017-08-30 17:25:03 +0000
81+++ specs/storage/ceph/base/pike/manifest 2017-08-31 15:16:44 +0000
82@@ -2,7 +2,7 @@
83 collect config=collect-ceph-default
84
85 # Use juju deployer with ceph-default.yaml bundle
86-deploy config=ceph-default.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
87+deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
88
89 # Check juju statuses are green and that hooks have finished
90 verify config=check_juju.py

Subscribers

People subscribed via source and target branches