Merge lp:~junaidali/charms/bundles/plumgrid-ons/mitaka-trusty into lp:~plumgrid-team/charms/bundles/plumgrid-ons/mitaka-trusty

Proposed by Junaid Ali
Status: Merged
Merged at revision: 3
Proposed branch: lp:~junaidali/charms/bundles/plumgrid-ons/mitaka-trusty
Merge into: lp:~plumgrid-team/charms/bundles/plumgrid-ons/mitaka-trusty
Diff against target: 81 lines (+9/-9)
1 file modified
bundle-cli.yaml (+9/-9)
To merge this branch: bzr merge lp:~junaidali/charms/bundles/plumgrid-ons/mitaka-trusty
Reviewer Review Type Date Requested Status
Bilal Baqar Pending
Review via email: mp+303649@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundle-cli.yaml'
2--- bundle-cli.yaml 2016-07-14 08:27:15 +0000
3+++ bundle-cli.yaml 2016-08-23 06:17:24 +0000
4@@ -61,7 +61,7 @@
5 - ['plumgrid-director', 'plumgrid-gateway']
6 services:
7 mysql:
8- charm: cs:trusty/percona-cluster-242
9+ charm: cs:trusty/percona-cluster-244
10 num_units: 1
11 annotations:
12 "gui-x": "-250"
13@@ -71,14 +71,14 @@
14 max-connections: 20000
15 to: 'lxc:controller-node=0'
16 rabbitmq-server:
17- charm: cs:trusty/rabbitmq-server-44
18+ charm: cs:trusty/rabbitmq-server-49
19 num_units: 1
20 annotations:
21 "gui-x": "-750"
22 "gui-y": "250"
23 to: 'lxc:controller-node=0'
24 keystone:
25- charm: cs:trusty/keystone-254
26+ charm: cs:trusty/keystone-256
27 num_units: 1
28 options:
29 admin-password: plumgrid
30@@ -88,7 +88,7 @@
31 "gui-y": "0"
32 to: 'lxc:controller-node=0'
33 nova-cloud-controller:
34- charm: cs:trusty/nova-cloud-controller-284
35+ charm: cs:trusty/nova-cloud-controller-288
36 num_units: 1
37 options:
38 console-access-protocol: novnc
39@@ -98,21 +98,21 @@
40 "gui-y": "0"
41 to: 'lxc:controller-node=0'
42 glance:
43- charm: cs:trusty/glance-249
44+ charm: cs:trusty/glance-251
45 num_units: 1
46 annotations:
47 "gui-x": "-250"
48 "gui-y": "-250"
49 to: 'lxc:controller-node=0'
50 openstack-dashboard:
51- charm: cs:trusty/openstack-dashboard-239
52+ charm: cs:trusty/openstack-dashboard-241
53 num_units: 1
54 annotations:
55 "gui-x": "0"
56 "gui-y": "-500"
57 to: 'lxc:controller-node=0'
58 neutron-api:
59- charm: cs:trusty/neutron-api-242
60+ charm: cs:trusty/neutron-api-244
61 num_units: 1
62 options:
63 neutron-security-groups: True
64@@ -143,7 +143,7 @@
65 to:
66 - "controller-node=0"
67 nova-compute:
68- charm: cs:trusty/nova-compute-254
69+ charm: cs:trusty/nova-compute-257
70 num_units: 2
71 options:
72 enable-live-migration: true
73@@ -174,7 +174,7 @@
74 plumgrid-mitaka:
75 inherits: plumgrid-ons-phase2
76 overrides:
77- # plumgrid virtual ip to be set as per environment
78+ # PLUMgrid Virtual IP, need to be updated as per the envrionment
79 plumgrid-virtual-ip: 192.168.200.250
80 source: cloud:trusty-mitaka
81 openstack-origin: cloud:trusty-mitaka

Subscribers

People subscribed via source and target branches

to all changes: