openstack/charm-neutron-api
Code Issues Proposed changes

Use new Calico 1.4 PPA

Browse Source 
Change-Id: Ia79f7521bc0d12493222df66975f41f50cd029b7
This commit is contained in:
Neil Jerram 2016-06-03 17:52:06 +01:00
parent 2be5ebddcc
commit fcdf2df065
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/neutron_api_utils.py
View File

@ -238,7 +238,7 @@ def additional_install_locations(plugin, source):
# From Liberty onwards, we can point to a PPA that does not include
# any patched OpenStack packages, and hence is independent of the
# OpenStack release.
calico_source = 'ppa:project-calico/stable'
calico_source = 'ppa:project-calico/calico-1.4'
add_source(calico_source)

2
unit_tests/test_neutron_api_utils.py
View File

@ -640,7 +640,7 @@ class TestNeutronAPIUtils(CharmTestCase):
def test_calico_source_liberty(self):
self.get_os_codename_install_source.return_value = 'liberty'
nutils.additional_install_locations('Calico', '')
self.add_source.assert_called_with('ppa:project-calico/stable')
self.add_source.assert_called_with('ppa:project-calico/calico-1.4')
@patch('shutil.rmtree')
def test_force_etcd_restart(self, rmtree):