Merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-missing-rel into lp:openstack-mojo-specs

Proposed by Liam Young
Status: Merged
Merged at revision: 277
Proposed branch: lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-missing-rel
Merge into: lp:openstack-mojo-specs
Diff against target: 83 lines (+7/-0)
7 files modified
helper/bundles/full-next.yaml (+1/-0)
helper/bundles/full-ssl-next.yaml (+1/-0)
helper/bundles/full-ssl.yaml (+1/-0)
helper/bundles/full-vrrpha-next.yaml (+1/-0)
helper/bundles/full.yaml (+1/-0)
helper/bundles/haphase2-next.yaml (+1/-0)
helper/bundles/haphase2.yaml (+1/-0)
To merge this branch: bzr merge lp:~gnuoy/openstack-mojo-specs/mojo-openstack-specs-missing-rel
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+307668@code.launchpad.net
To post a comment you must log in.
277. By Liam Young

Add neutron-gateway <-> neutron-api where needed

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/full-next.yaml'
2--- helper/bundles/full-next.yaml 2016-09-23 01:39:43 +0000
3+++ helper/bundles/full-next.yaml 2016-10-05 08:26:22 +0000
4@@ -145,6 +145,7 @@
5 - [ neutron-api, nova-cloud-controller ]
6 - [ neutron-api, neutron-openvswitch ]
7 - [ neutron-api, keystone ]
8+ - [ neutron-api, neutron-gateway ]
9 - [ neutron-openvswitch, nova-compute ]
10 - [ neutron-openvswitch, rabbitmq-server ]
11 openstack-icehouse-msg-split:
12
13=== modified file 'helper/bundles/full-ssl-next.yaml'
14--- helper/bundles/full-ssl-next.yaml 2016-09-23 01:39:43 +0000
15+++ helper/bundles/full-ssl-next.yaml 2016-10-05 08:26:22 +0000
16@@ -149,6 +149,7 @@
17 - [ neutron-api, nova-cloud-controller ]
18 - [ neutron-api, neutron-openvswitch ]
19 - [ neutron-api, keystone ]
20+ - [ neutron-api, neutron-gateway ]
21 - [ neutron-openvswitch, nova-compute ]
22 - [ neutron-openvswitch, rabbitmq-server ]
23 openstack-icehouse-msg-split:
24
25=== modified file 'helper/bundles/full-ssl.yaml'
26--- helper/bundles/full-ssl.yaml 2016-09-27 18:22:20 +0000
27+++ helper/bundles/full-ssl.yaml 2016-10-05 08:26:22 +0000
28@@ -150,6 +150,7 @@
29 - [ neutron-api, nova-cloud-controller ]
30 - [ neutron-api, neutron-openvswitch ]
31 - [ neutron-api, keystone ]
32+ - [ neutron-api, neutron-gateway ]
33 - [ neutron-openvswitch, nova-compute ]
34 - [ neutron-openvswitch, rabbitmq-server ]
35 openstack-icehouse-msg-split:
36
37=== modified file 'helper/bundles/full-vrrpha-next.yaml'
38--- helper/bundles/full-vrrpha-next.yaml 2016-09-13 05:18:45 +0000
39+++ helper/bundles/full-vrrpha-next.yaml 2016-10-05 08:26:22 +0000
40@@ -90,6 +90,7 @@
41 - [ neutron-api, neutron-openvswitch ]
42 - [ neutron-api, keystone ]
43 - [ neutron-api, "neutron-gateway:neutron-plugin-api" ]
44+ - [ neutron-api, neutron-gateway ]
45 - [ neutron-openvswitch, nova-compute ]
46 - [ neutron-openvswitch, rabbitmq-server ]
47 openstack-icehouse-msg-split:
48
49=== modified file 'helper/bundles/full.yaml'
50--- helper/bundles/full.yaml 2016-09-13 05:18:45 +0000
51+++ helper/bundles/full.yaml 2016-10-05 08:26:22 +0000
52@@ -147,6 +147,7 @@
53 - [ neutron-api, nova-cloud-controller ]
54 - [ neutron-api, neutron-openvswitch ]
55 - [ neutron-api, keystone ]
56+ - [ neutron-api, neutron-gateway ]
57 - [ neutron-openvswitch, nova-compute ]
58 - [ neutron-openvswitch, rabbitmq-server ]
59 openstack-icehouse-msg-split:
60
61=== modified file 'helper/bundles/haphase2-next.yaml'
62--- helper/bundles/haphase2-next.yaml 2016-09-13 05:18:45 +0000
63+++ helper/bundles/haphase2-next.yaml 2016-10-05 08:26:22 +0000
64@@ -202,6 +202,7 @@
65 - [ neutron-api, nova-cloud-controller ]
66 - [ neutron-api, neutron-openvswitch ]
67 - [ neutron-api, keystone ]
68+ - [ neutron-gateway, neutron-api ]
69 - [ neutron-openvswitch, nova-compute ]
70 - [ neutron-openvswitch, rabbitmq-server ]
71 #hacluster relation
72
73=== modified file 'helper/bundles/haphase2.yaml'
74--- helper/bundles/haphase2.yaml 2016-09-13 05:18:45 +0000
75+++ helper/bundles/haphase2.yaml 2016-10-05 08:26:22 +0000
76@@ -139,6 +139,7 @@
77 - [ cinder, cinder-ceph ]
78 - [ cinder-ceph, ceph ]
79 - [ neutron-gateway, nova-cloud-controller ]
80+ - [ neutron-gateway, neutron-api ]
81 - [ "neutron-gateway:amqp", rabbitmq-server ]
82 - [ openstack-dashboard, keystone ]
83 - [ openstack-dashboard, dashboard-hacluster ]

Subscribers

People subscribed via source and target branches