x/compass-core
Code Issues Proposed changes

add odl_l3_agent enable flag

Browse Source 
Change-Id: Ib2fe2c9ae31e44c6af921fcef3ce56fb494c7562
Signed-off-by: baigk <baiguoku@huawei.com>
This commit is contained in:
baigk 2016-02-18 18:54:17 +08:00
parent e8c5e79615
commit 59eee063a9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf/package_metadata/openstack.conf
View File

@ -81,7 +81,6 @@ METADATA = {
'default_value': True 'default_value': True
} }
}, },
'enable_vpnaas': { 'enable_vpnaas': {
'_self': { '_self': {
'mapping_to': 'enable_vpnaas', 'mapping_to': 'enable_vpnaas',
@ -90,6 +89,14 @@ METADATA = {
'default_value': True 'default_value': True
} }
}, },
'odl_l3_agent': {
'_self': {
'mapping_to': 'odl_l3_agent',
'field': 'anytype',
'is_required':False,
'default_value': 'Disable'
}
},
'network_cfg': { 'network_cfg': {
'_self': { '_self': {
'mapping_to': 'network_cfg' 'mapping_to': 'network_cfg'

1
conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
View File

@ -29,6 +29,7 @@
enable_secgroup: $getVar('enable_secgroup', True) enable_secgroup: $getVar('enable_secgroup', True)
enable_fwaas: $getVar('enable_fwaas', True) enable_fwaas: $getVar('enable_fwaas', True)
enable_vpnaas: $getVar('enable_vpnaas', True) enable_vpnaas: $getVar('enable_vpnaas', True)
odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
onos_nic: $getVar('onos_nic', 'eth2') onos_nic: $getVar('onos_nic', 'eth2')
ip_settings: $ip_settings ip_settings: $ip_settings
network_cfg: $network_cfg network_cfg: $network_cfg