From 0f866cf4bfd57c28a754f274582887c943694953 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Wed, 12 Oct 2016 11:28:57 -0400
Subject: Consolidate ODL SFC RPM into ODL RPM

OVS NSH can be installed at deploy time.

Change-Id: Ie875ada99053df95c6534e269f4dd627396489bc
JIRA: APEX-324
Signed-off-by: Dan Radez <dradez@redhat.com>
---
 build/c7-opnfv-x86_64-comps.xml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'build/c7-opnfv-x86_64-comps.xml')

diff --git a/build/c7-opnfv-x86_64-comps.xml b/build/c7-opnfv-x86_64-comps.xml
index a9b0af0c..67a0e511 100644
--- a/build/c7-opnfv-x86_64-comps.xml
+++ b/build/c7-opnfv-x86_64-comps.xml
@@ -3,7 +3,7 @@
 <comps>
   <group>
     <id>apex-opendaylight</id>
-    <name>OPNFV Apex OpenDaylight (non-sfc) Support</name>
+    <name>OPNFV Apex OpenDaylight Support</name>
     <description>Disk images and configuration files used to launch an Apex OpenDaylight deployment.</description>
     <default>false</default>
     <uservisible>false</uservisible>
@@ -15,7 +15,7 @@
   </group>
   <group>
     <id>apex-onos</id>
-    <name>OPNFV Apex ONOS (non-sfc) Support</name>
+    <name>OPNFV Apex ONOS Support</name>
     <description>Disk images and configuration files used to launch an Apex ONOS deployment.</description>
     <default>false</default>
     <uservisible>false</uservisible>
@@ -25,18 +25,6 @@
       <packagereq type="mandatory">opnfv-undercloud</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>apex-opendaylight-sfc</id>
-    <name>OPNFV Apex OpenDaylight SFC Support</name>
-    <description>Disk images and configuration files used to launch an Apex ODL SFC deployment.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">opnfv-apex-opendaylight-sfc</packagereq>
-      <packagereq type="mandatory">opnfv-common</packagereq>
-      <packagereq type="mandatory">opnfv-undercloud</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>additional-devel</id>
     <name>Additional Development</name>
@@ -7852,7 +7840,6 @@
       <groupid>virtualization-tools</groupid>
       <groupid>apex-opendaylight</groupid>
       <groupid>apex-onos</groupid>
-      <groupid>apex-opendaylight-sfc</groupid>
     </grouplist>
     <optionlist>
       <groupid>virtualization-platform</groupid>
@@ -7879,7 +7866,6 @@
       <groupid>virtualization-tools</groupid>
       <groupid>apex-opendaylight</groupid>
       <groupid>apex-onos</groupid>
-      <groupid>apex-opendaylight-sfc</groupid>
     </grouplist>
     <optionlist>
       <groupid>kde-desktop</groupid>
-- 
cgit 1.2.3-korg