From cb66a26868a5e92e689ac408495c59fbd3410bc1 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Wed, 20 Jul 2016 01:16:59 +0800 Subject: [PATCH] Add onos sfc support Change-Id: If12d493593b1c12cbc09e2373f7d4825759c8589 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 59fafc58..1a5dd1c4 100644 --- a/conf/package_metadata/openstack.conf +++ b/conf/package_metadata/openstack.conf @@ -97,6 +97,14 @@ METADATA = { 'default_value': 'Disable' } }, + 'onos_sfc': { + '_self': { + 'mapping_to': 'onos_sfc', + 'field': 'anytype', + 'is_required':False, + 'default_value': 'Disable' + } + }, 'network_cfg': { '_self': { 'mapping_to': 'network_cfg' 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 8cb19081..8af27860 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 @@ -30,6 +30,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_sfc: $getVar('onos_sfc', 'Disable') onos_nic: $getVar('onos_nic', 'eth2') ip_settings: $ip_settings network_cfg: $network_cfg