Merge lp:~barryprice/juju-deployer/resolve-OpenStack-1501-option-errors into lp:juju-deployer

Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: 220
Merged at revision: 220
Proposed branch: lp:~barryprice/juju-deployer/resolve-OpenStack-1501-option-errors
Merge into: lp:juju-deployer
Prerequisite: lp:~barryprice/juju-deployer/resolve-yaml-warnings
Diff against target: 16 lines (+0/-3)
1 file modified
deployer/tests/test_data/openstack/openstack-1501.yaml (+0/-3)
To merge this branch: bzr merge lp:~barryprice/juju-deployer/resolve-OpenStack-1501-option-errors
Reviewer Review Type Date Requested Status
Benjamin Allot Approve
Canonical IS Reviewers Pending
Review via email:

Commit message

Remove no-longer-supported charm options from Openstack bundle to fix tests

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Benjamin Allot (ballot) wrote :


review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 220

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'deployer/tests/test_data/openstack/openstack-1501.yaml'
--- deployer/tests/test_data/openstack/openstack-1501.yaml 2016-12-14 08:52:57 +0000
+++ deployer/tests/test_data/openstack/openstack-1501.yaml 2020-10-16 07:17:20 +0000
@@ -25,12 +25,9 @@
25 num_units: 125 num_units: 1
26 options:26 options:
27 osd-devices: /dev/sdb27 osd-devices: /dev/sdb
28 osd-reformat: "yes"
29 ceph-radosgw:28 ceph-radosgw:
30 charm: cs:trusty/ceph-radosgw29 charm: cs:trusty/ceph-radosgw
31 num_units: 130 num_units: 1
32 options:
33 use-embedded-webserver: true
34 cinder:31 cinder:
35 charm: cs:trusty/cinder32 charm: cs:trusty/cinder
36 num_units: 133 num_units: 1


People subscribed via source and target branches