From 59eee063a99f3eddb35a8d2fe2b3a073bf23de6e Mon Sep 17 00:00:00 2001 From: baigk Date: Thu, 18 Feb 2016 18:54:17 +0800 Subject: [PATCH] add odl_l3_agent enable flag Change-Id: Ib2fe2c9ae31e44c6af921fcef3ce56fb494c7562 Signed-off-by: baigk --- conf/package_metadata/openstack.conf | 9 ++++++++- .../openstack_liberty/vars/HA-ansible-multinodes.tmpl | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/package_metadata/openstack.conf b/conf/package_metadata/openstack.conf index 45eeb182..6bd1a26e 100644 --- a/conf/package_metadata/openstack.conf +++ b/conf/package_metadata/openstack.conf @@ -81,7 +81,6 @@ METADATA = { 'default_value': True } }, - 'enable_vpnaas': { '_self': { 'mapping_to': 'enable_vpnaas', @@ -90,6 +89,14 @@ METADATA = { 'default_value': True } }, + 'odl_l3_agent': { + '_self': { + 'mapping_to': 'odl_l3_agent', + 'field': 'anytype', + 'is_required':False, + 'default_value': 'Disable' + } + }, 'network_cfg': { '_self': { 'mapping_to': 'network_cfg' diff --git a/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl index 5987f44d..154cd444 100644 --- a/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl @@ -29,6 +29,7 @@ enable_secgroup: $getVar('enable_secgroup', True) enable_fwaas: $getVar('enable_fwaas', True) enable_vpnaas: $getVar('enable_vpnaas', True) +odl_l3_agent: $getVar('odl_l3_agent', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') ip_settings: $ip_settings network_cfg: $network_cfg