Juju Charms Collection
openstack-base package

Merge lp:~james-page/charms/bundles/openstack-base/bundle into lp:~charmers/charms/bundles/openstack-base/bundle

  1. Charm Bundles (0.0)
  2. bundle
  3. Merge into bundle
Proposed by James Page
Status: Merged
Merged at revision: 37
Proposed branch: lp:~james-page/charms/bundles/openstack-base/bundle
Merge into: lp:~charmers/charms/bundles/openstack-base/bundle
Diff against target: 211 lines (+31/-28)
2 files modified
README.md (+1/-1)
bundle.yaml (+30/-27)
To merge this branch: bzr merge lp:~james-page/charms/bundles/openstack-base/bundle
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
Liam Young (community) Approve
Review via email: mp+277798@code.launchpad.net

Description of the change

Updates for 15.10 charm release, switch to installing Liberty

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

I haven't deployed from the bundle but it looks good to me

review: Approve
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1454/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1439/

review: Needs Fixing (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2015-08-04 15:02:09 +0000
3+++ README.md 2015-11-18 09:52:47 +0000
4@@ -1,6 +1,6 @@
5 # Basic OpenStack Cloud
6
7-This bundle deploys a basic OpenStack Cloud (Kilo release) on Ubuntu 14.04 LTS, providing Dashboard, Compute, Network, Block Storage, Object Storage, Identity and Image services.
8+This bundle deploys a basic OpenStack Cloud (Liberty release) on Ubuntu 14.04 LTS, providing Dashboard, Compute, Network, Block Storage, Object Storage, Identity and Image services.
9
10 ## Requirements
11
12
13=== modified file 'bundle.yaml'
14--- bundle.yaml 2015-08-13 13:01:29 +0000
15+++ bundle.yaml 2015-11-18 09:52:47 +0000
16@@ -90,14 +90,14 @@
17 annotations:
18 gui-x: '750'
19 gui-y: '500'
20- charm: cs:trusty/ceph-38
21+ charm: cs:trusty/ceph-42
22 num_units: 3
23 options:
24 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
25 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
26 osd-devices: /dev/sdb
27 osd-reformat: 'yes'
28- source: cloud:trusty-kilo
29+ source: cloud:trusty-liberty
30 to:
31 - '1'
32 - '2'
33@@ -106,22 +106,22 @@
34 annotations:
35 gui-x: '1000'
36 gui-y: '500'
37- charm: cs:trusty/ceph-osd-12
38+ charm: cs:trusty/ceph-osd-14
39 num_units: 1
40 options:
41 osd-devices: /dev/sdb
42 osd-reformat: 'yes'
43- source: cloud:trusty-kilo
44+ source: cloud:trusty-liberty
45 to:
46 - '0'
47 ceph-radosgw:
48 annotations:
49 gui-x: '1000'
50 gui-y: '250'
51- charm: cs:trusty/ceph-radosgw-15
52+ charm: cs:trusty/ceph-radosgw-18
53 num_units: 1
54 options:
55- source: cloud:trusty-kilo
56+ source: cloud:trusty-liberty
57 use-embedded-webserver: true
58 to:
59 - lxc:0
60@@ -129,49 +129,49 @@
61 annotations:
62 gui-x: '750'
63 gui-y: '0'
64- charm: cs:trusty/cinder-26
65+ charm: cs:trusty/cinder-31
66 num_units: 1
67 options:
68 block-device: None
69 glance-api-version: 2
70 ha-mcastport: 5401
71- openstack-origin: cloud:trusty-kilo
72+ openstack-origin: cloud:trusty-liberty
73 to:
74 - lxc:1
75 cinder-ceph:
76 annotations:
77 gui-x: '750'
78 gui-y: '250'
79- charm: cs:trusty/cinder-ceph-9
80+ charm: cs:trusty/cinder-ceph-14
81 num_units: 0
82 glance:
83 annotations:
84 gui-x: '250'
85 gui-y: '0'
86- charm: cs:trusty/glance-24
87+ charm: cs:trusty/glance-28
88 num_units: 1
89 options:
90 ha-mcastport: 5402
91- openstack-origin: cloud:trusty-kilo
92+ openstack-origin: cloud:trusty-liberty
93 to:
94 - lxc:2
95 keystone:
96 annotations:
97 gui-x: '500'
98 gui-y: '0'
99- charm: cs:trusty/keystone-28
100+ charm: cs:trusty/keystone-31
101 num_units: 1
102 options:
103 admin-password: openstack
104 ha-mcastport: 5403
105- openstack-origin: cloud:trusty-kilo
106+ openstack-origin: cloud:trusty-liberty
107 to:
108 - lxc:3
109 mysql:
110 annotations:
111 gui-x: '0'
112 gui-y: '250'
113- charm: cs:trusty/percona-cluster-26
114+ charm: cs:trusty/percona-cluster-31
115 num_units: 1
116 options:
117 max-connections: 20000
118@@ -181,39 +181,39 @@
119 annotations:
120 gui-x: '500'
121 gui-y: '500'
122- charm: cs:trusty/neutron-api-17
123+ charm: cs:trusty/neutron-api-21
124 num_units: 1
125 options:
126 neutron-security-groups: true
127- openstack-origin: cloud:trusty-kilo
128+ openstack-origin: cloud:trusty-liberty
129 to:
130 - lxc:1
131 neutron-gateway:
132 annotations:
133 gui-x: '0'
134 gui-y: '0'
135- charm: cs:trusty/neutron-gateway-5
136+ charm: cs:trusty/neutron-gateway-7
137 num_units: 1
138 options:
139 ext-port: eth1
140- openstack-origin: cloud:trusty-kilo
141+ openstack-origin: cloud:trusty-liberty
142 to:
143 - '0'
144 neutron-openvswitch:
145 annotations:
146 gui-x: '250'
147 gui-y: '500'
148- charm: cs:trusty/neutron-openvswitch-9
149+ charm: cs:trusty/neutron-openvswitch-13
150 num_units: 0
151 nova-cloud-controller:
152 annotations:
153 gui-x: '0'
154 gui-y: '500'
155- charm: cs:trusty/nova-cloud-controller-60
156+ charm: cs:trusty/nova-cloud-controller-64
157 num_units: 1
158 options:
159 network-manager: Neutron
160- openstack-origin: cloud:trusty-kilo
161+ openstack-origin: cloud:trusty-liberty
162 quantum-security-groups: 'yes'
163 to:
164 - lxc:2
165@@ -221,13 +221,14 @@
166 annotations:
167 gui-x: '250'
168 gui-y: '250'
169- charm: cs:trusty/nova-compute-26
170+ charm: cs:trusty/nova-compute-33
171 num_units: 3
172 options:
173 enable-live-migration: true
174 enable-resize: true
175 migration-auth-type: ssh
176- openstack-origin: cloud:trusty-kilo
177+ openstack-origin: cloud:trusty-liberty
178+ manage-neutron-plugin-legacy-mode: False
179 to:
180 - '1'
181 - '2'
182@@ -236,24 +237,26 @@
183 annotations:
184 gui-x: '1000'
185 gui-y: '0'
186- charm: cs:trusty/ntp-11
187+ charm: cs:trusty/ntp-14
188 num_units: 0
189 openstack-dashboard:
190 annotations:
191 gui-x: '500'
192 gui-y: '-250'
193- charm: cs:trusty/openstack-dashboard-16
194+ charm: cs:trusty/openstack-dashboard-19
195 num_units: 1
196 options:
197- openstack-origin: cloud:trusty-kilo
198+ openstack-origin: cloud:trusty-liberty
199 to:
200 - lxc:3
201 rabbitmq-server:
202 annotations:
203 gui-x: '500'
204 gui-y: '250'
205- charm: cs:trusty/rabbitmq-server-33
206+ charm: cs:trusty/rabbitmq-server-42
207 num_units: 1
208+ options:
209+ source: cloud:trusty-liberty
210 to:
211 - lxc:0
212

Subscribers

People subscribed via source and target branches