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
=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml 2016-04-18 13:50:34 +0000
+++ bundles/lxd/next.yaml 2016-04-21 11:26:31 +0000
@@ -1,93 +1,107 @@
1# vim: set ts=2 et:1# vim: set ts=2 et:
2# deployer bundle for development ('next') charms2# deployer bundle for development ('next') charms
3# UOSCI relies on this for OS-on-OS deployment testing3# UOSCI relies on this for OS-on-OS deployment testing
4deploy-nodes:
5 series: xenial
6 services:
7 controller-node:
8 charm: cs:~landscape/xenial/ubuntu
9 num_units: 1
10 compute-node:
11 charm: cs:~landscape/xenial/ubuntu
12 num_units: 1
13 gateway-node:
14 charm: cs:~landscape/xenial/ubuntu
15 num_units: 1
4openstack-services:16openstack-services:
17 inherits: deploy-nodes
5 services:18 services:
6 mysql:19 mysql:
7 branch: lp:charms/trusty/mysql20 branch: lp:charms/trusty/mysql
8 #https://github.com/openstack/charm-percona-cluster21 #https://github.com/openstack/charm-percona-cluster
9 constraints: mem=1G
10 options:22 options:
11 dataset-size: 50%23 dataset-size: 50%
12 max-connections: 2000024 max-connections: 20000
25 to: 'lxc:controller-node=0'
13 rabbitmq-server:26 rabbitmq-server:
14 branch: https://github.com/openstack/charm-rabbitmq-server27 branch: https://github.com/openstack/charm-rabbitmq-server
15 constraints: mem=1G28 to: 'lxc:controller-node=0'
16 keystone:29 keystone:
17 branch: https://github.com/openstack/charm-keystone30 branch: https://github.com/openstack/charm-keystone
18 constraints: mem=1G
19 options:31 options:
20 admin-password: openstack32 admin-password: openstack
21 admin-token: ubuntutesting33 admin-token: ubuntutesting
34 to: 'lxc:controller-node=0'
22 openstack-dashboard:35 openstack-dashboard:
23 branch: https://github.com/openstack/charm-openstack-dashboard36 branch: https://github.com/openstack/charm-openstack-dashboard
24 constraints: mem=1G37 to: 'lxc:controller-node=0'
25 nova-compute:38 nova-compute:
26 branch: https://github.com/openstack/charm-nova-compute39 branch: https://github.com/openstack/charm-nova-compute
27 num_units: 340 num_units: 1
28 constraints: mem=4G
29 options:41 options:
30 enable-live-migration: True42 enable-live-migration: True
31 enable-resize: True43 enable-resize: True
32 migration-auth-type: ssh44 migration-auth-type: ssh
33 virt-type: lxd45 virt-type: lxd
46 to: 'compute-node=0'
34 nova-cloud-controller:47 nova-cloud-controller:
35 branch: https://github.com/openstack/charm-nova-cloud-controller48 branch: https://github.com/openstack/charm-nova-cloud-controller
36 constraints: mem=1G
37 options:49 options:
38 network-manager: Neutron50 network-manager: Neutron
51 console-access-protocol: novnc
39 ram-allocation-ratio: 5.052 ram-allocation-ratio: 5.0
40 neutron-gateway:53 to: 'lxc:controller-node=0'
41 branch: https://github.com/openstack/charm-neutron-gateway54 #neutron-gateway:
42 constraints: mem=1G55 # branch: https://github.com/openstack/charm-neutron-gateway
43 options:56 # options:
44 instance-mtu: 130057 # instance-mtu: 1300
58 # to: 'lxc:gateway-node=0'
45 glance:59 glance:
46 branch: https://github.com/openstack/charm-glance60 branch: https://github.com/openstack/charm-glance
47 constraints: mem=1G61 to: 'lxc:controller-node=0'
48 swift-proxy:62 #swift-proxy:
49 branch: https://github.com/openstack/charm-swift-proxy63 # branch: https://github.com/openstack/charm-swift-proxy
50 constraints: mem=1G64 # options:
51 options:65 # zone-assignment: manual
52 zone-assignment: manual66 # replicas: 3
53 replicas: 367 # swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
54 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae68 #swift-storage-z1:
55 swift-storage-z1:69 # branch: https://github.com/openstack/charm-swift-storage
56 branch: https://github.com/openstack/charm-swift-storage70 # options:
57 constraints: mem=1G71 # zone: 1
58 options:72 # block-device: vdb
59 zone: 173 # overwrite: "true"
60 block-device: vdb74 #swift-storage-z2:
61 overwrite: "true"75 # branch: https://github.com/openstack/charm-swift-storage
62 swift-storage-z2:76 # options:
63 branch: https://github.com/openstack/charm-swift-storage77 # zone: 2
64 constraints: mem=1G78 # block-device: vdb
65 options:79 # overwrite: "true"
66 zone: 280 #swift-storage-z3:
67 block-device: vdb81 # branch: https://github.com/openstack/charm-swift-storage
68 overwrite: "true"82 # options:
69 swift-storage-z3:83 # zone: 3
70 branch: https://github.com/openstack/charm-swift-storage84 # block-device: vdb
71 constraints: mem=1G85 # overwrite: "true"
72 options:86 #ceilometer:
73 zone: 387 # branch: https://github.com/openstack/charm-ceilometer
74 block-device: vdb88 #ceilometer-agent:
75 overwrite: "true"89 # branch: https://github.com/openstack/charm-ceilometer-agent
76 ceilometer:90 #heat:
77 branch: https://github.com/openstack/charm-ceilometer91 # branch: https://github.com/openstack/charm-heat
78 constraints: mem=1G92 #mongodb:
79 ceilometer-agent:93 # branch: lp:charms/trusty/mongodb
80 branch: https://github.com/openstack/charm-ceilometer-agent
81 heat:
82 branch: https://github.com/openstack/charm-heat
83 mongodb:
84 branch: lp:charms/trusty/mongodb
85 constraints: mem=1G
86 lxd:94 lxd:
87 branch: https://github.com/openstack/charm-lxd95 branch: https://github.com/openstack/charm-lxd
88 options:96 options:
97<<<<<<< TREE
89 block-devices: /dev/vdb98 block-devices: /dev/vdb
90 ephemeral-unmount: /mnt99 ephemeral-unmount: /mnt
100=======
101 #block-device: /dev/vdb
102 block-devices: "/var/lib/volume-1.img|10G"
103 #ephemeral-unmount: /mnt
104>>>>>>> MERGE-SOURCE
91 storage-type: lvm105 storage-type: lvm
92 overwrite: "true"106 overwrite: "true"
93 relations:107 relations:
@@ -105,45 +119,46 @@
105 - [ glance, mysql ]119 - [ glance, mysql ]
106 - [ glance, keystone ]120 - [ glance, keystone ]
107 - [ glance, rabbitmq-server ]121 - [ glance, rabbitmq-server ]
108 - [ glance, swift-proxy ]122 #- [ glance, swift-proxy ]
109 - [ neutron-gateway, nova-cloud-controller ]123 #- [ neutron-gateway, nova-cloud-controller ]
110 - [ openstack-dashboard, keystone ]124 - [ openstack-dashboard, keystone ]
111 - [ swift-proxy, keystone ]125 #- [ swift-proxy, keystone ]
112 - [ swift-proxy, swift-storage-z1 ]126 #- [ swift-proxy, swift-storage-z1 ]
113 - [ swift-proxy, swift-storage-z2 ]127 #- [ swift-proxy, swift-storage-z2 ]
114 - [ swift-proxy, swift-storage-z3 ]128 #- [ swift-proxy, swift-storage-z3 ]
115 - - ceilometer129 #- - ceilometer
116 - keystone:identity-service130 # - keystone:identity-service
117 - [ ceilometer, rabbitmq-server ]131 #- [ ceilometer, rabbitmq-server ]
118 - [ ceilometer, mongodb ]132 #- [ ceilometer, mongodb ]
119 - [ ceilometer-agent, nova-compute ]133 #- [ ceilometer-agent, nova-compute ]
120 - [ ceilometer-agent, ceilometer ]134 #- [ ceilometer-agent, ceilometer ]
121 - [ heat, mysql ]135 #- [ heat, mysql ]
122 - [ heat, keystone ]136 #- [ heat, keystone ]
123 - [ heat, rabbitmq-server ]137 #- [ heat, rabbitmq-server ]
124openstack-singlerabbit:138#openstack-singlerabbit:
139# inherits: openstack-services
140# relations:
141# - [ "neutron-gateway:amqp", rabbitmq-server ]
142openstack-icehouse:
125 inherits: openstack-services143 inherits: openstack-services
126 relations:
127 - [ "neutron-gateway:amqp", rabbitmq-server ]
128openstack-icehouse:
129 inherits: openstack-singlerabbit
130 services:144 services:
131 neutron-api:145 neutron-api:
132 branch: https://github.com/openstack/charm-neutron-api146 branch: https://github.com/openstack/charm-neutron-api
133 constraints: mem=1G147 #constraints: mem=1G
134 options:148 options:
135 neutron-security-groups: True149 neutron-security-groups: True
136 neutron-openvswitch:150 to: 'lxc:controller-node=0'
137 branch: https://github.com/openstack/charm-neutron-openvswitch151 #neutron-openvswitch:
152 # branch: https://github.com/openstack/charm-neutron-openvswitch
138 relations:153 relations:
139 - [ neutron-api, mysql ]154 - [ neutron-api, mysql ]
140 - [ neutron-api, rabbitmq-server ]155 - [ neutron-api, rabbitmq-server ]
141 - [ neutron-api, nova-cloud-controller ]156 - [ neutron-api, nova-cloud-controller ]
142 - [ neutron-api, neutron-openvswitch ]157 #- [ neutron-api, neutron-openvswitch ]
143 - [ neutron-api, keystone ]158 - [ neutron-api, keystone ]
144 - [ neutron-api, neutron-gateway ]159 #- [ neutron-api, neutron-gateway ]
145 - [ neutron-openvswitch, nova-compute ]160 #- [ neutron-openvswitch, nova-compute ]
146 - [ neutron-openvswitch, rabbitmq-server ]161 #- [ neutron-openvswitch, rabbitmq-server ]
147# Liberty162# Liberty
148wily-liberty:163wily-liberty:
149 inherits: openstack-icehouse164 inherits: openstack-icehouse

Subscribers

People subscribed via source and target branches

to status/vote changes: