openstack/charm-neutron-gateway
Code Issues Proposed changes

change run-internal-router and external-network-id to use - in their names to be consistent with other user set variables

Browse Source
This commit is contained in:
Juju Management User 2013-11-19 10:59:12 +00:00
parent b4e1f6be9a
commit 602e4b59cf
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -65,10 +65,10 @@ network id can be set differently for each gateway e.g.
Create extnet1 and extnet2 via neutron client and take a note of their ids
juju set quantum-gateway-extnet1 "run_internal_router=leader"
juju set quantum-gateway-extnet2 "run_internal_router=none"
juju set quantum-gateway-extnet1 "external_network_id=<extnet1 id>"
juju set quantum-gateway-extnet2 "external_network_id=<extnet2 id>"
juju set quantum-gateway-extnet1 "run-internal-router=leader"
juju set quantum-gateway-extnet2 "run-internal-router=none"
juju set quantum-gateway-extnet1 "external-network-id=<extnet1 id>"
juju set quantum-gateway-extnet2 "external-network-id=<extnet2 id>"
See upstream [Neutron multi extnet](http://docs.openstack.org/trunk/config-reference/content/adv_cfg_l3_agent_multi_extnet.html)

8
config.yaml
View File

@ -25,7 +25,7 @@ options:
- deb http://my.archive.com/ubuntu main|KEYID
.
Note that quantum/neutron is only supported >= Folsom.
run_internal_router:
run-internal-router:
type: string
default: all
description: |
@ -36,12 +36,12 @@ options:
leader => Set to be true on one node (the leader) and false everywhere
else.
Use leader and none when configuring multiple floating pools
external_network_id:
external-network-id:
type: string
description: |
Optional configuration to set the external_network_id. Only needed when
Optional configuration to set the external-network-id. Only needed when
configuring multiple external networks and should be used in conjunction
with run_internal_router.
with run-internal-router.
rabbit-user:
type: string
default: neutron

12
hooks/quantum_contexts.py
View File

@ -105,18 +105,18 @@ class NetworkServiceContext(OSContextGenerator):
class L3AgentContext(OSContextGenerator):
def __call__(self):
ctxt = {}
if config('run_internal_router') == 'leader':
if config('run-internal-router') == 'leader':
ctxt['handle_internal_only_router'] = eligible_leader(None)
if config('run_internal_router') == 'all':
if config('run-internal-router') == 'all':
ctxt['handle_internal_only_router'] = True
if config('run_internal_router') == 'none':
if config('run-internal-router') == 'none':
ctxt['handle_internal_only_router'] = False
if (eligible_leader(None) and config('external_network_id') and
config('run_internal_router') != 'all'):
ctxt['external_network_id'] = config('external_network_id')
if (eligible_leader(None) and config('external-network-id') and
config('run-internal-router') != 'all'):
ctxt['external-network-id'] = config('external-network-id')
return ctxt

4
templates/havana/l3_agent.ini
View File

@ -8,6 +8,6 @@ admin_password = {{ service_password }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
ovs_use_veth = True
handle_internal_only_routers = {{ handle_internal_only_router }}
{% if external_network_id %}
gateway_external_network_id = {{ external_network_id }}
{% if external-network-id %}
gateway_external_network_id = {{ external-network-id }}
{% endif %}

14
unit_tests/test_quantum_contexts.py
View File

@ -149,23 +149,23 @@ class TestL3AgentContext(CharmTestCase):
self.config.side_effect = self.test_config.get
def test_no_ext_netid(self):
self.test_config.set('run_internal_router', 'none')
self.test_config.set('external_network_id', '')
self.test_config.set('run-internal-router', 'none')
self.test_config.set('external-network-id', '')
self.eligible_leader.return_value = False
self.assertEquals(quantum_contexts.L3AgentContext()(),
{'handle_internal_only_router': False})
def test_hior_leader(self):
self.test_config.set('run_internal_router', 'leader')
self.test_config.set('external_network_id', 'netid')
self.test_config.set('run-internal-router', 'leader')
self.test_config.set('external-network-id', 'netid')
self.eligible_leader.return_value = True
self.assertEquals(quantum_contexts.L3AgentContext()(),
{'handle_internal_only_router': True,
'external_network_id': 'netid'})
'external-network-id': 'netid'})
def test_hior_all(self):
self.test_config.set('run_internal_router', 'all')
self.test_config.set('external_network_id', 'netid')
self.test_config.set('run-internal-router', 'all')
self.test_config.set('external-network-id', 'netid')
self.eligible_leader.return_value = True
self.assertEquals(quantum_contexts.L3AgentContext()(),
{'handle_internal_only_router': True})