OpenStack Charm Testing

Merge lp:~bbaqar/openstack-charm-testing/lxd-baremetal into lp:openstack-charm-testing

  1. lxd-baremetal
  2. Merge into trunk
Proposed by Bilal Baqar
Status: Rejected
Rejected by: Ryan Beisner
Proposed branch: lp:~bbaqar/openstack-charm-testing/lxd-baremetal
Merge into: lp:openstack-charm-testing
Diff against target: 236 lines (+93/-78) (has conflicts)
1 file modified
bundles/lxd/next.yaml (+93/-78)
Text conflict in bundles/lxd/next.yaml
To merge this branch: bzr merge lp:~bbaqar/openstack-charm-testing/lxd-baremetal
Reviewer Review Type Date Requested Status
Ryan Beisner Disapprove
Review via email: mp+291939@code.launchpad.net

Description of the change

Wont merge.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI, the lxd/next.yaml bundle file is not for bare metal. It's for our OpenStack-on-OpenStack charm testing, where every unit gets its own machine (except subordinates). LXC and the Juju OpenStack Provider (aka Goose) does not support containers.

We would be happy to take a merge proposal to add a lxd/baremetal-next.yaml however.

Thank you.

review: Disapprove
Revision history for this message
Bilal Baqar (bbaqar) wrote :

Got it.

lp:~bbaqar/openstack-charm-testing/lxd-baremetal updated
201. By Bilal Baqar

without ovs

Unmerged revisions

201. By Bilal Baqar

without ovs

200. By Bilal Baqar

Deploying lxd bundle on baremetal

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/lxd/next.yaml'
2--- bundles/lxd/next.yaml 2016-04-18 13:50:34 +0000
3+++ bundles/lxd/next.yaml 2016-04-21 11:26:31 +0000
4@@ -1,93 +1,107 @@
5 # vim: set ts=2 et:
6 # deployer bundle for development ('next') charms
7 # UOSCI relies on this for OS-on-OS deployment testing
8+deploy-nodes:
9+ series: xenial
10+ services:
11+ controller-node:
12+ charm: cs:~landscape/xenial/ubuntu
13+ num_units: 1
14+ compute-node:
15+ charm: cs:~landscape/xenial/ubuntu
16+ num_units: 1
17+ gateway-node:
18+ charm: cs:~landscape/xenial/ubuntu
19+ num_units: 1
20 openstack-services:
21+ inherits: deploy-nodes
22 services:
23 mysql:
24 branch: lp:charms/trusty/mysql
25 #https://github.com/openstack/charm-percona-cluster
26- constraints: mem=1G
27 options:
28 dataset-size: 50%
29 max-connections: 20000
30+ to: 'lxc:controller-node=0'
31 rabbitmq-server:
32 branch: https://github.com/openstack/charm-rabbitmq-server
33- constraints: mem=1G
34+ to: 'lxc:controller-node=0'
35 keystone:
36 branch: https://github.com/openstack/charm-keystone
37- constraints: mem=1G
38 options:
39 admin-password: openstack
40 admin-token: ubuntutesting
41+ to: 'lxc:controller-node=0'
42 openstack-dashboard:
43 branch: https://github.com/openstack/charm-openstack-dashboard
44- constraints: mem=1G
45+ to: 'lxc:controller-node=0'
46 nova-compute:
47 branch: https://github.com/openstack/charm-nova-compute
48- num_units: 3
49- constraints: mem=4G
50+ num_units: 1
51 options:
52 enable-live-migration: True
53 enable-resize: True
54 migration-auth-type: ssh
55 virt-type: lxd
56+ to: 'compute-node=0'
57 nova-cloud-controller:
58 branch: https://github.com/openstack/charm-nova-cloud-controller
59- constraints: mem=1G
60 options:
61 network-manager: Neutron
62+ console-access-protocol: novnc
63 ram-allocation-ratio: 5.0
64- neutron-gateway:
65- branch: https://github.com/openstack/charm-neutron-gateway
66- constraints: mem=1G
67- options:
68- instance-mtu: 1300
69+ to: 'lxc:controller-node=0'
70+ #neutron-gateway:
71+ # branch: https://github.com/openstack/charm-neutron-gateway
72+ # options:
73+ # instance-mtu: 1300
74+ # to: 'lxc:gateway-node=0'
75 glance:
76 branch: https://github.com/openstack/charm-glance
77- constraints: mem=1G
78- swift-proxy:
79- branch: https://github.com/openstack/charm-swift-proxy
80- constraints: mem=1G
81- options:
82- zone-assignment: manual
83- replicas: 3
84- swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
85- swift-storage-z1:
86- branch: https://github.com/openstack/charm-swift-storage
87- constraints: mem=1G
88- options:
89- zone: 1
90- block-device: vdb
91- overwrite: "true"
92- swift-storage-z2:
93- branch: https://github.com/openstack/charm-swift-storage
94- constraints: mem=1G
95- options:
96- zone: 2
97- block-device: vdb
98- overwrite: "true"
99- swift-storage-z3:
100- branch: https://github.com/openstack/charm-swift-storage
101- constraints: mem=1G
102- options:
103- zone: 3
104- block-device: vdb
105- overwrite: "true"
106- ceilometer:
107- branch: https://github.com/openstack/charm-ceilometer
108- constraints: mem=1G
109- ceilometer-agent:
110- branch: https://github.com/openstack/charm-ceilometer-agent
111- heat:
112- branch: https://github.com/openstack/charm-heat
113- mongodb:
114- branch: lp:charms/trusty/mongodb
115- constraints: mem=1G
116+ to: 'lxc:controller-node=0'
117+ #swift-proxy:
118+ # branch: https://github.com/openstack/charm-swift-proxy
119+ # options:
120+ # zone-assignment: manual
121+ # replicas: 3
122+ # swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
123+ #swift-storage-z1:
124+ # branch: https://github.com/openstack/charm-swift-storage
125+ # options:
126+ # zone: 1
127+ # block-device: vdb
128+ # overwrite: "true"
129+ #swift-storage-z2:
130+ # branch: https://github.com/openstack/charm-swift-storage
131+ # options:
132+ # zone: 2
133+ # block-device: vdb
134+ # overwrite: "true"
135+ #swift-storage-z3:
136+ # branch: https://github.com/openstack/charm-swift-storage
137+ # options:
138+ # zone: 3
139+ # block-device: vdb
140+ # overwrite: "true"
141+ #ceilometer:
142+ # branch: https://github.com/openstack/charm-ceilometer
143+ #ceilometer-agent:
144+ # branch: https://github.com/openstack/charm-ceilometer-agent
145+ #heat:
146+ # branch: https://github.com/openstack/charm-heat
147+ #mongodb:
148+ # branch: lp:charms/trusty/mongodb
149 lxd:
150 branch: https://github.com/openstack/charm-lxd
151 options:
152+<<<<<<< TREE
153 block-devices: /dev/vdb
154 ephemeral-unmount: /mnt
155+=======
156+ #block-device: /dev/vdb
157+ block-devices: "/var/lib/volume-1.img|10G"
158+ #ephemeral-unmount: /mnt
159+>>>>>>> MERGE-SOURCE
160 storage-type: lvm
161 overwrite: "true"
162 relations:
163@@ -105,45 +119,46 @@
164 - [ glance, mysql ]
165 - [ glance, keystone ]
166 - [ glance, rabbitmq-server ]
167- - [ glance, swift-proxy ]
168- - [ neutron-gateway, nova-cloud-controller ]
169+ #- [ glance, swift-proxy ]
170+ #- [ neutron-gateway, nova-cloud-controller ]
171 - [ openstack-dashboard, keystone ]
172- - [ swift-proxy, keystone ]
173- - [ swift-proxy, swift-storage-z1 ]
174- - [ swift-proxy, swift-storage-z2 ]
175- - [ swift-proxy, swift-storage-z3 ]
176- - - ceilometer
177- - keystone:identity-service
178- - [ ceilometer, rabbitmq-server ]
179- - [ ceilometer, mongodb ]
180- - [ ceilometer-agent, nova-compute ]
181- - [ ceilometer-agent, ceilometer ]
182- - [ heat, mysql ]
183- - [ heat, keystone ]
184- - [ heat, rabbitmq-server ]
185-openstack-singlerabbit:
186+ #- [ swift-proxy, keystone ]
187+ #- [ swift-proxy, swift-storage-z1 ]
188+ #- [ swift-proxy, swift-storage-z2 ]
189+ #- [ swift-proxy, swift-storage-z3 ]
190+ #- - ceilometer
191+ # - keystone:identity-service
192+ #- [ ceilometer, rabbitmq-server ]
193+ #- [ ceilometer, mongodb ]
194+ #- [ ceilometer-agent, nova-compute ]
195+ #- [ ceilometer-agent, ceilometer ]
196+ #- [ heat, mysql ]
197+ #- [ heat, keystone ]
198+ #- [ heat, rabbitmq-server ]
199+#openstack-singlerabbit:
200+# inherits: openstack-services
201+# relations:
202+# - [ "neutron-gateway:amqp", rabbitmq-server ]
203+openstack-icehouse:
204 inherits: openstack-services
205- relations:
206- - [ "neutron-gateway:amqp", rabbitmq-server ]
207-openstack-icehouse:
208- inherits: openstack-singlerabbit
209 services:
210 neutron-api:
211 branch: https://github.com/openstack/charm-neutron-api
212- constraints: mem=1G
213+ #constraints: mem=1G
214 options:
215 neutron-security-groups: True
216- neutron-openvswitch:
217- branch: https://github.com/openstack/charm-neutron-openvswitch
218+ to: 'lxc:controller-node=0'
219+ #neutron-openvswitch:
220+ # branch: https://github.com/openstack/charm-neutron-openvswitch
221 relations:
222 - [ neutron-api, mysql ]
223 - [ neutron-api, rabbitmq-server ]
224 - [ neutron-api, nova-cloud-controller ]
225- - [ neutron-api, neutron-openvswitch ]
226+ #- [ neutron-api, neutron-openvswitch ]
227 - [ neutron-api, keystone ]
228- - [ neutron-api, neutron-gateway ]
229- - [ neutron-openvswitch, nova-compute ]
230- - [ neutron-openvswitch, rabbitmq-server ]
231+ #- [ neutron-api, neutron-gateway ]
232+ #- [ neutron-openvswitch, nova-compute ]
233+ #- [ neutron-openvswitch, rabbitmq-server ]
234 # Liberty
235 wily-liberty:
236 inherits: openstack-icehouse

Subscribers

People subscribed via source and target branches

to status/vote changes: