Charm Helpers

Merge lp:~thedac/charm-helpers/fix-nova-cc-amqp into lp:charm-helpers

  1. fix-nova-cc-amqp
  2. Merge into devel
Proposed by David Ames
Status: Merged
Merged at revision: 695
Proposed branch: lp:~thedac/charm-helpers/fix-nova-cc-amqp
Merge into: lp:charm-helpers
Diff against target: 96 lines (+10/-9)
2 files modified
charmhelpers/contrib/openstack/context.py (+2/-1)
tests/contrib/openstack/test_os_contexts.py (+8/-8)
To merge this branch: bzr merge lp:~thedac/charm-helpers/fix-nova-cc-amqp
Reviewer Review Type Date Requested Status
Alex Kavanagh Approve
Corey Bryant (community) Approve
charmers Pending
Review via email: mp+318129@code.launchpad.net

Description of the change

In Ocata nova uses the transport_url for communication to rabbitmq.
In the charm the default port 5672 was assumed. However, when
rabbitmq uses SSL it changes the port to 5671.

This change is the fix which makes the default port explicit and
changes the port when SSL is in use.

To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Thanks! Looks good to me but I can't merge.

review: Approve
Revision history for this message
Alex Kavanagh (ajkavanagh) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/context.py'
2--- charmhelpers/contrib/openstack/context.py 2017-02-16 18:56:32 +0000
3+++ charmhelpers/contrib/openstack/context.py 2017-02-23 16:23:12 +0000
4@@ -396,7 +396,7 @@
5 ha_vip_only = False
6 self.related = True
7 transport_hosts = None
8- rabbitmq_port = ''
9+ rabbitmq_port = '5672'
10 for unit in related_units(rid):
11 if relation_get('clustered', rid=rid, unit=unit):
12 ctxt['clustered'] = True
13@@ -420,6 +420,7 @@
14 ssl_port = relation_get('ssl_port', rid=rid, unit=unit)
15 if ssl_port:
16 ctxt['rabbit_ssl_port'] = ssl_port
17+ rabbitmq_port = ssl_port
18
19 ssl_ca = relation_get('ssl_ca', rid=rid, unit=unit)
20 if ssl_ca:
21
22=== modified file 'tests/contrib/openstack/test_os_contexts.py'
23--- tests/contrib/openstack/test_os_contexts.py 2017-02-14 12:52:41 +0000
24+++ tests/contrib/openstack/test_os_contexts.py 2017-02-23 16:23:12 +0000
25@@ -947,7 +947,7 @@
26 'rabbitmq_password': 'foobar',
27 'rabbitmq_user': 'adam',
28 'rabbitmq_virtual_host': 'foo',
29- 'transport_url': 'rabbit://adam:foobar@rabbithost:/foo'
30+ 'transport_url': 'rabbit://adam:foobar@rabbithost:5672/foo'
31 }
32 self.assertEquals(result, expected)
33
34@@ -965,7 +965,7 @@
35 'rabbitmq_password': 'foobar',
36 'rabbitmq_user': 'adam',
37 'rabbitmq_virtual_host': 'foo',
38- 'transport_url': 'rabbit://adam:foobar@rabbithost:/foo'
39+ 'transport_url': 'rabbit://adam:foobar@rabbithost:5672/foo'
40 }
41 self.assertEquals(result, expected)
42
43@@ -986,7 +986,7 @@
44 'rabbitmq_virtual_host': 'foo',
45 'rabbit_ssl_ca': ssl_dir + '/rabbit-client-ca.pem',
46 'rabbitmq_ha_queues': True,
47- 'transport_url': 'rabbit://adam:foobar@rabbithost:/foo'
48+ 'transport_url': 'rabbit://adam:foobar@rabbithost:5671/foo'
49 }
50 _open.assert_called_once_with(ssl_dir + '/rabbit-client-ca.pem', 'w')
51 self.assertEquals(result, expected)
52@@ -1008,7 +1008,7 @@
53 'rabbitmq_virtual_host': 'foo',
54 'rabbit_ssl_ca': 'cert',
55 'rabbitmq_ha_queues': True,
56- 'transport_url': 'rabbit://adam:foobar@rabbithost:/foo'
57+ 'transport_url': 'rabbit://adam:foobar@rabbithost:5671/foo'
58 }
59 self.assertEquals(result, expected)
60
61@@ -1027,7 +1027,7 @@
62 'rabbitmq_password': 'foobar',
63 'rabbitmq_user': 'adam',
64 'rabbitmq_virtual_host': 'foo',
65- 'transport_url': 'rabbit://adam:foobar@10.0.0.1:/foo'
66+ 'transport_url': 'rabbit://adam:foobar@10.0.0.1:5672/foo'
67 }
68 self.assertEquals(result, expected)
69
70@@ -1047,7 +1047,7 @@
71 'rabbitmq_user': 'adam',
72 'rabbitmq_virtual_host': 'foo',
73 'rabbitmq_hosts': 'rabbithost1,rabbithost2',
74- 'transport_url': 'rabbit://adam:foobar@rabbithost1:,adam:foobar@rabbithost2:/foo'
75+ 'transport_url': 'rabbit://adam:foobar@rabbithost1:5672,adam:foobar@rabbithost2:5672/foo'
76 }
77 self.assertEquals(result, expected)
78
79@@ -1089,7 +1089,7 @@
80 'rabbitmq_user': 'adam',
81 'rabbitmq_virtual_host': 'foo',
82 'rabbitmq_hosts': '[2001:db8:1::1],[2001:db8:1::1]',
83- 'transport_url': 'rabbit://adam:foobar@[2001:db8:1::1]:,adam:foobar@[2001:db8:1::1]:/foo'
84+ 'transport_url': 'rabbit://adam:foobar@[2001:db8:1::1]:5672,adam:foobar@[2001:db8:1::1]:5672/foo'
85 }
86 self.assertEquals(result, expected)
87
88@@ -1111,7 +1111,7 @@
89 'rabbit_retry_backoff': '1',
90 'rabbit_retry_interval': '1'
91 },
92- 'transport_url': 'rabbit://adam:foobar@rabbithost:/foo'
93+ 'transport_url': 'rabbit://adam:foobar@rabbithost:5672/foo'
94 }
95
96 self.assertEquals(result, expected)

Subscribers

People subscribed via source and target branches