Openstack Mojo Testing

Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-quantum-fix into lp:openstack-mojo-specs

  1. mojo-openstack-specs-quantum-fix
  2. Merge into mojo-openstack-specs
Proposed by Liam Young
Status: Merged
Merged at revision: 249
Proposed branch: lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-quantum-fix
Merge into: lp:openstack-mojo-specs
Diff against target: 143 lines (+0/-12)
12 files modified
helper/bundles/baremetal7.yaml (+0/-1)
helper/bundles/full.yaml (+0/-1)
helper/bundles/full_dvr.yaml (+0/-1)
helper/bundles/full_ssl.yaml (+0/-1)
helper/bundles/full_vrrpha.yaml (+0/-1)
helper/bundles/ha.yaml (+0/-1)
helper/bundles/haphase1.yaml (+0/-1)
helper/bundles/haphase2.yaml (+0/-1)
helper/bundles/ksv3_full.yaml (+0/-1)
helper/bundles/minimal.yaml (+0/-1)
helper/bundles/next-ha.yaml (+0/-1)
helper/bundles/ssl-everywhere.yaml (+0/-1)
To merge this branch: bzr merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-quantum-fix
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+291586@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2245 mojo-openstack-specs for gnuoy mp291586
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2245/

Revision history for this message
James Page (james-page) :
review: Approve
lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-quantum-fix updated
250. By Liam Young

First steps to enabling git /next support

251. By Liam Young

Fix typo

252. By Liam Young

Add missing symlink

253. By Liam Young

Temp debug

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/baremetal7.yaml'
2--- helper/bundles/baremetal7.yaml 2016-04-08 14:00:41 +0000
3+++ helper/bundles/baremetal7.yaml 2016-04-12 07:49:20 +0000
4@@ -86,7 +86,6 @@
5 charm: nova-cloud-controller
6 options:
7 network-manager: Neutron
8- quantum-security-groups: "yes"
9 to:
10 - "lxc:swift-storage-z3=0"
11 neutron-gateway:
12
13=== modified file 'helper/bundles/full.yaml'
14--- helper/bundles/full.yaml 2016-04-08 14:00:41 +0000
15+++ helper/bundles/full.yaml 2016-04-12 07:49:20 +0000
16@@ -41,7 +41,6 @@
17 constraints: mem=1G
18 options:
19 network-manager: Quantum
20- quantum-security-groups: "yes"
21 neutron-gateway:
22 charm: neutron-gateway
23 constraints: mem=1G
24
25=== modified file 'helper/bundles/full_dvr.yaml'
26--- helper/bundles/full_dvr.yaml 2016-04-08 14:00:41 +0000
27+++ helper/bundles/full_dvr.yaml 2016-04-12 07:49:20 +0000
28@@ -41,7 +41,6 @@
29 constraints: mem=1G
30 options:
31 network-manager: Quantum
32- quantum-security-groups: "yes"
33 cinder:
34 charm: cinder
35 options:
36
37=== modified file 'helper/bundles/full_ssl.yaml'
38--- helper/bundles/full_ssl.yaml 2016-04-08 14:00:41 +0000
39+++ helper/bundles/full_ssl.yaml 2016-04-12 07:49:20 +0000
40@@ -45,7 +45,6 @@
41 constraints: mem=1G
42 options:
43 network-manager: Quantum
44- quantum-security-groups: "yes"
45 neutron-gateway:
46 charm: neutron-gateway
47 constraints: mem=1G
48
49=== modified file 'helper/bundles/full_vrrpha.yaml'
50--- helper/bundles/full_vrrpha.yaml 2016-04-08 14:00:41 +0000
51+++ helper/bundles/full_vrrpha.yaml 2016-04-12 07:49:20 +0000
52@@ -30,7 +30,6 @@
53 constraints: mem=1G
54 options:
55 network-manager: Quantum
56- quantum-security-groups: "yes"
57 neutron-gateway:
58 charm: neutron-gateway
59 constraints: mem=1G
60
61=== modified file 'helper/bundles/ha.yaml'
62--- helper/bundles/ha.yaml 2016-04-08 14:00:41 +0000
63+++ helper/bundles/ha.yaml 2016-04-12 07:49:20 +0000
64@@ -69,7 +69,6 @@
65 num_units: 3
66 options:
67 network-manager: Neutron
68- quantum-security-groups: "yes"
69 vip: 10.5.100.4
70 nova-cc-hacluster:
71 charm: hacluster
72
73=== modified file 'helper/bundles/haphase1.yaml'
74--- helper/bundles/haphase1.yaml 2016-04-08 14:00:41 +0000
75+++ helper/bundles/haphase1.yaml 2016-04-12 07:49:20 +0000
76@@ -51,7 +51,6 @@
77 num_units: 2
78 options:
79 network-manager: Quantum
80- quantum-security-groups: "yes"
81 vip: 10.5.100.3
82 ncc-hacluster:
83 charm: hacluster
84
85=== modified file 'helper/bundles/haphase2.yaml'
86--- helper/bundles/haphase2.yaml 2016-04-08 14:00:41 +0000
87+++ helper/bundles/haphase2.yaml 2016-04-12 07:49:20 +0000
88@@ -51,7 +51,6 @@
89 num_units: 2
90 options:
91 network-manager: Quantum
92- quantum-security-groups: "yes"
93 vip: 10.5.100.3
94 ncc-hacluster:
95 charm: hacluster
96
97=== modified file 'helper/bundles/ksv3_full.yaml'
98--- helper/bundles/ksv3_full.yaml 2016-04-08 14:00:41 +0000
99+++ helper/bundles/ksv3_full.yaml 2016-04-12 07:49:20 +0000
100@@ -46,7 +46,6 @@
101 constraints: mem=1G
102 options:
103 network-manager: Neutron
104- quantum-security-groups: "yes"
105 neutron-gateway:
106 charm: neutron-gateway
107 constraints: mem=1G
108
109=== modified file 'helper/bundles/minimal.yaml'
110--- helper/bundles/minimal.yaml 2016-04-08 14:00:41 +0000
111+++ helper/bundles/minimal.yaml 2016-04-12 07:49:20 +0000
112@@ -28,7 +28,6 @@
113 constraints: mem=1G
114 options:
115 network-manager: Quantum
116- quantum-security-groups: "yes"
117 neutron-gateway:
118 charm: neutron-gateway
119 constraints: mem=1G
120
121=== modified file 'helper/bundles/next-ha.yaml'
122--- helper/bundles/next-ha.yaml 2016-04-08 14:00:41 +0000
123+++ helper/bundles/next-ha.yaml 2016-04-12 07:49:20 +0000
124@@ -72,7 +72,6 @@
125 constraints: mem=1G
126 options:
127 network-manager: Quantum
128- quantum-security-groups: "yes"
129 vip: 10.5.104.1
130 nova-cloud-controller-hacluster:
131 charm: hacluster
132
133=== modified file 'helper/bundles/ssl-everywhere.yaml'
134--- helper/bundles/ssl-everywhere.yaml 2016-03-07 15:30:54 +0000
135+++ helper/bundles/ssl-everywhere.yaml 2016-04-12 07:49:20 +0000
136@@ -46,7 +46,6 @@
137 constraints: mem=1G
138 options:
139 network-manager: Quantum
140- quantum-security-groups: "yes"
141 neutron-gateway:
142 branch: lp:~openstack-charmers/charms/precise/quantum-gateway/ssl-everywhere
143 constraints: mem=1G

Subscribers

People subscribed via source and target branches