Charm Helpers

Merge lp:~fnordahl/charm-helpers/bug-1636098 into lp:charm-helpers

  1. bug-1636098
  2. Merge into devel
Proposed by Frode Nordahl
Status: Merged
Merged at revision: 661
Proposed branch: lp:~fnordahl/charm-helpers/bug-1636098
Merge into: lp:charm-helpers
Diff against target: 140 lines (+10/-7)
7 files modified
charmhelpers/contrib/openstack/context.py (+4/-1)
charmhelpers/contrib/openstack/neutron.py (+2/-0)
charmhelpers/contrib/openstack/utils.py (+1/-0)
tests/contrib/openstack/test_os_contexts.py (+0/-6)
tests/core/test_services.py (+1/-0)
tests/core/test_unitdata.py (+1/-0)
tools/charm_helpers_sync/charm_helpers_sync.py (+1/-0)
To merge this branch: bzr merge lp:~fnordahl/charm-helpers/bug-1636098
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Edward Hope-Morley Pending
Review via email: mp+311878@code.launchpad.net

Description of the change

Updated version that fix compability with relation changes in charm-keystone

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

LGTM, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py 2016-11-11 18:38:30 +0000
+++ charmhelpers/contrib/openstack/context.py 2016-11-26 15:53:07 +0000
@@ -337,7 +337,6 @@
337 'service_host': serv_host,337 'service_host': serv_host,
338 'auth_host': auth_host,338 'auth_host': auth_host,
339 'auth_port': rdata.get('auth_port'),339 'auth_port': rdata.get('auth_port'),
340 'admin_domain_name': rdata.get('service_domain'),
341 'admin_tenant_name': rdata.get('service_tenant'),340 'admin_tenant_name': rdata.get('service_tenant'),
342 'admin_user': rdata.get('service_username'),341 'admin_user': rdata.get('service_username'),
343 'admin_password': rdata.get('service_password'),342 'admin_password': rdata.get('service_password'),
@@ -345,6 +344,10 @@
345 'auth_protocol': auth_protocol,344 'auth_protocol': auth_protocol,
346 'api_version': api_version})345 'api_version': api_version})
347346
347 if float(api_version) > 2:
348 ctxt.update({'admin_domain_name':
349 rdata.get('service_domain')})
350
348 if self.context_complete(ctxt):351 if self.context_complete(ctxt):
349 # NOTE(jamespage) this is required for >= icehouse352 # NOTE(jamespage) this is required for >= icehouse
350 # so a missing value just indicates keystone needs353 # so a missing value just indicates keystone needs
351354
=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py 2016-09-22 19:04:33 +0000
+++ charmhelpers/contrib/openstack/neutron.py 2016-11-26 15:53:07 +0000
@@ -32,6 +32,7 @@
32 kver = check_output(['uname', '-r']).decode('UTF-8').strip()32 kver = check_output(['uname', '-r']).decode('UTF-8').strip()
33 return 'linux-headers-%s' % kver33 return 'linux-headers-%s' % kver
3434
35
35QUANTUM_CONF_DIR = '/etc/quantum'36QUANTUM_CONF_DIR = '/etc/quantum'
3637
3738
@@ -91,6 +92,7 @@
91 }92 }
92 }93 }
9394
95
94NEUTRON_CONF_DIR = '/etc/neutron'96NEUTRON_CONF_DIR = '/etc/neutron'
9597
9698
9799
=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py 2016-11-11 18:09:38 +0000
+++ charmhelpers/contrib/openstack/utils.py 2016-11-26 15:53:07 +0000
@@ -683,6 +683,7 @@
683 else:683 else:
684 zap_disk(block_device)684 zap_disk(block_device)
685685
686
686is_ip = ip.is_ip687is_ip = ip.is_ip
687ns_query = ip.ns_query688ns_query = ip.ns_query
688get_host_ip = ip.get_host_ip689get_host_ip = ip.get_host_ip
689690
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py 2016-11-11 18:38:30 +0000
+++ tests/contrib/openstack/test_os_contexts.py 2016-11-26 15:53:07 +0000
@@ -759,7 +759,6 @@
759 result = identity_service()759 result = identity_service()
760 expected = {760 expected = {
761 'admin_password': 'foo',761 'admin_password': 'foo',
762 'admin_domain_name': 'admin_domain',
763 'admin_tenant_name': 'admin',762 'admin_tenant_name': 'admin',
764 'admin_tenant_id': None,763 'admin_tenant_id': None,
765 'admin_user': 'adam',764 'admin_user': 'adam',
@@ -787,7 +786,6 @@
787 result = identity_service()786 result = identity_service()
788 expected = {787 expected = {
789 'admin_password': 'foo',788 'admin_password': 'foo',
790 'admin_domain_name': 'admin_domain',
791 'admin_tenant_name': 'admin',789 'admin_tenant_name': 'admin',
792 'admin_tenant_id': None,790 'admin_tenant_id': None,
793 'admin_user': 'adam',791 'admin_user': 'adam',
@@ -811,7 +809,6 @@
811 result = identity_service()809 result = identity_service()
812 expected = {810 expected = {
813 'admin_password': 'foo',811 'admin_password': 'foo',
814 'admin_domain_name': 'admin_domain',
815 'admin_tenant_name': 'admin',812 'admin_tenant_name': 'admin',
816 'admin_tenant_id': None,813 'admin_tenant_id': None,
817 'admin_user': 'adam',814 'admin_user': 'adam',
@@ -835,7 +832,6 @@
835 result = identity_service()832 result = identity_service()
836 expected = {833 expected = {
837 'admin_password': 'foo',834 'admin_password': 'foo',
838 'admin_domain_name': 'admin_domain',
839 'admin_tenant_name': 'admin',835 'admin_tenant_name': 'admin',
840 'admin_tenant_id': '123456',836 'admin_tenant_id': '123456',
841 'admin_user': 'adam',837 'admin_user': 'adam',
@@ -857,7 +853,6 @@
857 result = identity_service()853 result = identity_service()
858 expected = {854 expected = {
859 'admin_password': 'foo',855 'admin_password': 'foo',
860 'admin_domain_name': 'admin_domain',
861 'admin_tenant_name': 'admin',856 'admin_tenant_name': 'admin',
862 'admin_tenant_id': None,857 'admin_tenant_id': None,
863 'admin_user': 'adam',858 'admin_user': 'adam',
@@ -902,7 +897,6 @@
902 result = identity_service()897 result = identity_service()
903 expected = {898 expected = {
904 'admin_password': 'foo',899 'admin_password': 'foo',
905 'admin_domain_name': 'admin_domain',
906 'admin_tenant_name': 'admin',900 'admin_tenant_name': 'admin',
907 'admin_tenant_id': '123456',901 'admin_tenant_id': '123456',
908 'admin_user': 'adam',902 'admin_user': 'adam',
909903
=== modified file 'tests/core/test_services.py'
--- tests/core/test_services.py 2015-12-08 05:43:34 +0000
+++ tests/core/test_services.py 2016-11-26 15:53:07 +0000
@@ -863,5 +863,6 @@
863 mock.call(1),863 mock.call(1),
864 mock.call(2)])864 mock.call(2)])
865865
866
866if __name__ == '__main__':867if __name__ == '__main__':
867 unittest.main()868 unittest.main()
868869
=== modified file 'tests/core/test_unitdata.py'
--- tests/core/test_unitdata.py 2015-02-06 13:46:20 +0000
+++ tests/core/test_unitdata.py 2016-11-26 15:53:07 +0000
@@ -222,5 +222,6 @@
222 kv.flush(False)222 kv.flush(False)
223 self.assertEqual(kv.get('hello'), 'world')223 self.assertEqual(kv.get('hello'), 'world')
224224
225
225if __name__ == '__main__':226if __name__ == '__main__':
226 unittest.main()227 unittest.main()
227228
=== modified file 'tools/charm_helpers_sync/charm_helpers_sync.py'
--- tools/charm_helpers_sync/charm_helpers_sync.py 2016-07-06 14:41:05 +0000
+++ tools/charm_helpers_sync/charm_helpers_sync.py 2016-11-26 15:53:07 +0000
@@ -191,6 +191,7 @@
191 inc, opts = extract_options(m, global_options)191 inc, opts = extract_options(m, global_options)
192 sync(src, dest, '%s.%s' % (k, inc), opts)192 sync(src, dest, '%s.%s' % (k, inc), opts)
193193
194
194if __name__ == '__main__':195if __name__ == '__main__':
195 parser = optparse.OptionParser()196 parser = optparse.OptionParser()
196 parser.add_option('-c', '--config', action='store', dest='config',197 parser.add_option('-c', '--config', action='store', dest='config',

Subscribers

People subscribed via source and target branches