From 545f1499eab39b26dc54eba239d8bfc314bdce7e Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Wed, 7 Sep 2016 23:37:05 +0800 Subject: [PATCH] Add odl sfc configuration Change-Id: I332532d7fd5a70ac4caaca7d923e6bdefd8f6772 Signed-off-by: Yifei Xue --- conf/package_metadata/openstack.conf | 8 ++++++++ .../openstack_mitaka/vars/HA-ansible-multinodes.tmpl | 1 + 2 files changed, 9 insertions(+) diff --git a/conf/package_metadata/openstack.conf b/conf/package_metadata/openstack.conf index acba2f79..3edef381 100644 --- a/conf/package_metadata/openstack.conf +++ b/conf/package_metadata/openstack.conf @@ -105,6 +105,14 @@ METADATA = { 'default_value': 'Disable' } }, + 'odl_sfc': { + '_self': { + 'mapping_to': 'odl_sfc', + 'field': 'anytype', + 'is_required':False, + 'default_value': 'Disable' + } + }, 'moon': { '_self': { 'mapping_to': 'moon', diff --git a/conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl b/conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl index 8af27860..1f2eb1e0 100644 --- a/conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl +++ b/conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl @@ -32,6 +32,7 @@ enable_vpnaas: $getVar('enable_vpnaas', True) odl_l3_agent: $getVar('odl_l3_agent', 'Disable') onos_sfc: $getVar('onos_sfc', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') +odl_sfc: $getVar('odl_sfc', 'Disable') ip_settings: $ip_settings network_cfg: $network_cfg sys_intf_mappings: $sys_intf_mappings