OpenStack Charm Testing

Merge lp:~james-page/openstack-charm-testing/next-us-cs into lp:openstack-charm-testing

  1. next-us-cs
  2. Merge into trunk
Proposed by James Page
Status: Rejected
Rejected by: Ryan Beisner
Proposed branch: lp:~james-page/openstack-charm-testing/next-us-cs
Merge into: lp:openstack-charm-testing
Diff against target: 234 lines (+63/-28)
2 files modified
bundles/sparse/next.yaml (+60/-26)
profiles/default (+3/-2)
To merge this branch: bzr merge lp:~james-page/openstack-charm-testing/next-us-cs
Reviewer Review Type Date Requested Status
Ryan Beisner Needs Resubmitting
Review via email: mp+307685@code.launchpad.net

Description of the change

Switch to using the charm-store for next.yaml; this works OK with Juju 2.0 but I've not tested with 1.25.x yet.

To post a comment you must log in.
lp:~james-page/openstack-charm-testing/next-us-cs updated
251. By James Page

Add designate to bundle

252. By James Page

Ensure aodh and designate are >= mitaka only

253. By James Page

Add designate options, enable port security by default, add second cirros image for tempest testing use

254. By James Page

Upload two cirros images for better tempest tests

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Apologies for the delay in review. I believe everything originally proposed here is covered by the following.

Re: Designate, a separate review has landed:
https://code.launchpad.net/~corey.bryant/openstack-charm-testing/add-new-svcs-to-sparse/+merge/313156

Re: Charmstore urls, I've proposed that here:
https://code.launchpad.net/~1chb1n/openstack-charm-testing/use-cs/+merge/316177

Re: Second cirros image, I picked and landed that here:
http://bazaar.launchpad.net/~ost-maintainers/openstack-charm-testing/trunk/revision/266

review: Needs Resubmitting

Unmerged revisions

254. By James Page

Upload two cirros images for better tempest tests

253. By James Page

Add designate options, enable port security by default, add second cirros image for tempest testing use

252. By James Page

Ensure aodh and designate are >= mitaka only

251. By James Page

Add designate to bundle

250. By James Page

Switch next.yaml to use charmstore for charms, add aodh

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/sparse/next.yaml'
2--- bundles/sparse/next.yaml 2016-09-29 12:56:01 +0000
3+++ bundles/sparse/next.yaml 2016-10-12 17:13:36 +0000
4@@ -4,10 +4,10 @@
5 base-services:
6 services:
7 rabbitmq-server:
8- branch: https://github.com/openstack/charm-rabbitmq-server
9+ charm: cs:~openstack-charmers-next/rabbitmq-server
10 constraints: mem=1G
11 ceph:
12- branch: https://github.com/openstack/charm-ceph
13+ charm: cs:~openstack-charmers-next/ceph
14 num_units: 3
15 constraints: mem=1G
16 options:
17@@ -18,16 +18,16 @@
18 osd-reformat: "yes"
19 ephemeral-unmount: /mnt
20 keystone:
21- branch: https://github.com/openstack/charm-keystone
22+ charm: cs:~openstack-charmers-next/keystone
23 constraints: mem=1G
24 options:
25 admin-password: openstack
26 admin-token: ubuntutesting
27 openstack-dashboard:
28- branch: https://github.com/openstack/charm-openstack-dashboard
29+ charm: cs:~openstack-charmers-next/openstack-dashboard
30 constraints: mem=1G
31 nova-compute:
32- branch: https://github.com/openstack/charm-nova-compute
33+ charm: cs:~openstack-charmers-next/nova-compute
34 num_units: 3
35 constraints: mem=4G
36 options:
37@@ -35,72 +35,74 @@
38 enable-resize: True
39 migration-auth-type: ssh
40 nova-cloud-controller:
41- branch: https://github.com/openstack/charm-nova-cloud-controller
42+ charm: cs:~openstack-charmers-next/nova-cloud-controller
43 constraints: mem=1G
44 options:
45 network-manager: Neutron
46 neutron-gateway:
47- branch: https://github.com/openstack/charm-neutron-gateway
48+ charm: cs:~openstack-charmers-next/neutron-gateway
49 constraints: mem=4G
50 options:
51 instance-mtu: 1300
52 bridge-mappings: physnet1:br-ex
53 neutron-api:
54- branch: https://github.com/openstack/charm-neutron-api
55+ charm: cs:~openstack-charmers-next/neutron-api
56 constraints: mem=1G
57 options:
58 neutron-security-groups: True
59+ enable-ml2-port-security: True
60 flat-network-providers: physnet1
61 neutron-openvswitch:
62- branch: https://github.com/openstack/charm-neutron-openvswitch
63+ charm: cs:~openstack-charmers-next/neutron-openvswitch
64 cinder:
65- branch: https://github.com/openstack/charm-cinder
66+ charm: cs:~openstack-charmers-next/cinder
67 options:
68 block-device: "None"
69 glance-api-version: 2
70 constraints: mem=1G
71 cinder-ceph:
72- branch: https://github.com/openstack/charm-cinder-ceph
73+ charm: cs:~openstack-charmers-next/cinder-ceph
74 glance:
75- branch: https://github.com/openstack/charm-glance
76+ charm: cs:~openstack-charmers-next/glance
77 constraints: mem=1G
78 swift-proxy:
79- branch: https://github.com/openstack/charm-swift-proxy
80+ charm: cs:~openstack-charmers-next/swift-proxy
81 constraints: mem=1G
82 options:
83 zone-assignment: manual
84 replicas: 3
85 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
86 swift-storage-z1:
87- branch: https://github.com/openstack/charm-swift-storage
88+ charm: cs:~openstack-charmers-next/swift-storage
89 constraints: mem=1G
90 options:
91 zone: 1
92 block-device: vdb
93 overwrite: "true"
94 swift-storage-z2:
95- branch: https://github.com/openstack/charm-swift-storage
96+ charm: cs:~openstack-charmers-next/swift-storage
97 constraints: mem=1G
98 options:
99 zone: 2
100 block-device: vdb
101 overwrite: "true"
102 swift-storage-z3:
103- branch: https://github.com/openstack/charm-swift-storage
104+ charm: cs:~openstack-charmers-next/swift-storage
105 constraints: mem=1G
106 options:
107 zone: 3
108 block-device: vdb
109 overwrite: "true"
110 ceilometer:
111- branch: https://github.com/openstack/charm-ceilometer
112+ charm: cs:~openstack-charmers-next/ceilometer
113 constraints: mem=1G
114 ceilometer-agent:
115- branch: https://github.com/openstack/charm-ceilometer-agent
116+ charm: cs:~openstack-charmers-next/ceilometer-agent
117 heat:
118- branch: https://github.com/openstack/charm-heat
119+ charm: cs:~openstack-charmers-next/heat
120 mongodb:
121- branch: lp:charms/trusty/mongodb
122+ charm: cs:trusty/mongodb
123+ series: trusty
124 constraints: mem=1G
125 relations:
126 - [ keystone, mysql ]
127@@ -153,7 +155,8 @@
128 inherits: base-services
129 services:
130 mysql:
131- branch: lp:charms/trusty/mysql
132+ charm: cs:trusty/mysql
133+ series: trusty
134 constraints: mem=2G
135 options:
136 dataset-size: 50%
137@@ -162,13 +165,44 @@
138 inherits: base-services
139 services:
140 mysql:
141- branch: https://github.com/openstack/charm-percona-cluster
142+ charm: cs:~openstack-charmers-next/percona-cluster
143 constraints: mem=4G
144 options:
145 dataset-size: 50%
146 max-connections: 20000
147 root-password: ChangeMe123
148 sst-password: ChangeMe123
149+openstack-mitaka:
150+ inherits: openstack-services
151+ services:
152+ aodh:
153+ charm: cs:~openstack-charmers-next/aodh
154+ num_units: 1
155+ constraints: mem=1G
156+ designate:
157+ charm: cs:~openstack-charmers-next/designate
158+ num_units: 1
159+ constraints: mem=1G
160+ options:
161+ nameservers: ns1.octest.com.
162+ nova-domain: nova.octest.com.
163+ nova-domain-email: test@nova.octest.com
164+ neutron-domain: neutron.octest.com.
165+ neutron-domain-email: test@neutron.octest.com
166+ nova-record-format: '%(hostname)s.%(tenant_id)s.%(zone)s'
167+ designate-bind:
168+ charm: cs:~openstack-charmers-next/designate-bind
169+ num_units: 1
170+ constraints: mem=1G
171+ relations:
172+ - [ aodh, keystone ]
173+ - [ aodh, rabbitmq-server ]
174+ - [ aodh, mysql ]
175+ - [ designate, keystone ]
176+ - [ designate, rabbitmq-server ]
177+ - [ designate, mysql ]
178+ - [ designate, nova-compute ]
179+ - [ designate, designate-bind ]
180 # icehouse
181 precise-icehouse:
182 inherits: openstack-services-legacy
183@@ -250,7 +284,7 @@
184 openstack-origin: distro-proposed
185 # mitaka
186 trusty-mitaka:
187- inherits: openstack-services
188+ inherits: openstack-mitaka
189 series: trusty
190 overrides:
191 openstack-origin: cloud:trusty-mitaka
192@@ -266,7 +300,7 @@
193 openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
194 source: ppa:ubuntu-cloud-archive/mitaka-staging
195 xenial-mitaka:
196- inherits: openstack-services
197+ inherits: openstack-mitaka
198 series: xenial
199 xenial-mitaka-proposed:
200 inherits: xenial-mitaka
201@@ -275,7 +309,7 @@
202 openstack-origin: distro-proposed
203 # newton
204 xenial-newton:
205- inherits: openstack-services
206+ inherits: openstack-mitaka
207 series: xenial
208 overrides:
209 openstack-origin: cloud:xenial-newton
210@@ -296,7 +330,7 @@
211 openstack-origin: ppa:openstack-ubuntu-testing/newton
212 source: ppa:openstack-ubuntu-testing/newton
213 yakkety-newton:
214- inherits: openstack-services
215+ inherits: openstack-mitaka
216 series: yakkety
217 yakkety-newton-proposed:
218 inherits: yakkety-newton
219
220=== modified file 'profiles/default'
221--- profiles/default 2016-09-23 14:16:37 +0000
222+++ profiles/default 2016-10-12 17:13:36 +0000
223@@ -32,9 +32,10 @@
224 upload_image cloudimages trusty trusty-server-cloudimg-amd64-disk1.img
225 upload_image cloudimages precise precise-server-cloudimg-amd64-disk1.img
226 upload_image swift cirros cirros-0.3.4-x86_64-disk.img
227+upload_image swift cirros2 cirros-0.3.4-x86_64-disk.img
228
229-image_id=$(openstack image list | awk '/cirros/ {print $2}')
230-image_alt_id=$(openstack image list | awk '/trusty/ {print $2}')
231+image_id=$(openstack image list | awk '/cirros\s/ {print $2}')
232+image_alt_id=$(openstack image list | awk '/cirros2\s/ {print $2}')
233
234 create_tempest_users
235

Subscribers

People subscribed via source and target branches

to status/vote changes: