openstack/charm-neutron-api
Code Issues Proposed changes

Fixup errors in catchup merge.

Browse Source
This commit is contained in:
Cory Benfield
2015-03-10 16:41:28 +00:00
parent 0f347b7911
commit 3558c0530b
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.yaml
View File

@@ -67,7 +67,6 @@ options:
. .
gre gre
vxlan vxlan
>>>>>>> MERGE-SOURCE
. .
# HA configuration settings # HA configuration settings
vip: vip:

2
hooks/neutron_api_hooks.py
View File

@@ -43,7 +43,7 @@ from neutron_api_utils import (
register_configs, register_configs,
restart_map, restart_map,
services, services,
setup_ipv6 setup_ipv6,
additional_install_locations additional_install_locations
) )
from neutron_api_context import ( from neutron_api_context import (

2
unit_tests/test_neutron_api_hooks.py
View File

@@ -275,7 +275,7 @@ class NeutronAPIHooksTests(CharmTestCase):
self.unit_get.return_value = '172.18.18.18' self.unit_get.return_value = '172.18.18.18'
_relation_data = { _relation_data = {
'neutron-security-groups': False, 'neutron-security-groups': False,
'addr': '172.18.18.18' 'addr': '172.18.18.18',
'l2-population': False, 'l2-population': False,
'overlay-network-type': 'vxlan', 'overlay-network-type': 'vxlan',
} }