From 2726171455085f5435414a8ba558f53db6c8165a Mon Sep 17 00:00:00 2001 From: dongfeng Date: Tue, 29 Dec 2015 17:57:38 +0800 Subject: [PATCH] upload onosfw plugin makefile Change-Id: I70f81d0ad66d559a672ca037021b4256b18a202d --- build/f_isoroot/f_onosfwpluginbuild/config.mk | 5 ++--- .../f_onosfwpluginbuild/config/onosfw_config.yaml | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk index bf0942d49..e41a1ada3 100644 --- a/build/f_isoroot/f_onosfwpluginbuild/config.mk +++ b/build/f_isoroot/f_onosfwpluginbuild/config.mk @@ -7,6 +7,5 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -ONOS_BRANCH=1e0aef4a4495b66122c00bbe698ec95d8d17fe5a -ONOS_REPO=https://review.openstack.org/openstack/fuel-plugin-onos -ONOS_CHANGE= +ONOS_BRANCH=Kilo +ONOS_REPO=git://git.openstack.org/openstack/fuel-plugin-onos diff --git a/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml b/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml index 17d7e5d42..c6e60fd69 100644 --- a/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml +++ b/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml @@ -1,5 +1,17 @@ -attributes: +onos: metadata: + enabled: true + label: onos plugin + plugin_id: 1 restrictions: - - "cluster:net_provider != 'neutron'": "Neutron only" - + - cluster:net_provider != 'neutron': Neutron only + toggleable: true + weight: 70 + public_eth: + description: Please note that onos needs an independent eth for public network + when interfaces of nodes are configured, or L3 traffic to internet will fail! + Defualt is eth3. + label: Public Ethernet Port + type: text + value: eth3 + weight: 20 -- 2.16.6