x/group-based-policy
Code Issues Proposed changes

Merge "[apic] make get_apic_manager compatible with both config options" into stable/mitaka

Browse Source
This commit is contained in:
Jenkins
2016-10-13 01:35:22 +00:00
committed by Gerrit Code Review
parent 25a43ba9c3 1518291ad0
commit 2baaa1cec7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
View File

@@ -262,7 +262,10 @@ class ApicMappingDriver(api.ResourceMappingDriver,
@staticmethod
def get_apic_manager(client=True):
if not ApicMappingDriver.manager:
apic_config = cfg.CONF.apic
if cfg.CONF.apic.apic_username is not None:
apic_config = cfg.CONF.apic
else:
apic_config = cfg.CONF.ml2_cisco_apic
network_config = {
'vlan_ranges': cfg.CONF.ml2_type_vlan.network_vlan_ranges,
'vni_ranges': cfg.CONF.ml2_type_vxlan.vni_ranges,