From b3840e9981c007e26eb7cbdf94f66d0f58a6e3f7 Mon Sep 17 00:00:00 2001 From: Dan Radez 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 (cherry picked from commit 0f866cf4bfd57c28a754f274582887c943694953) --- build/overcloud-opendaylight-sfc.sh | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100755 build/overcloud-opendaylight-sfc.sh (limited to 'build/overcloud-opendaylight-sfc.sh') diff --git a/build/overcloud-opendaylight-sfc.sh b/build/overcloud-opendaylight-sfc.sh deleted file mode 100755 index 444d284a..00000000 --- a/build/overcloud-opendaylight-sfc.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e -source ./variables.sh -pushd images > /dev/null - -################################################ -##### Adding SFC+OpenDaylight overcloud ##### -################################################ - -#copy opendaylight overcloud full to odl-sfc -cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qcow2 - -# upgrade ovs into ovs 2.5.90 with NSH function -LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ - --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ - -a overcloud-full-opendaylight-sfc_build.qcow2 - -mv overcloud-full-opendaylight-sfc_build.qcow2 overcloud-full-opendaylight-sfc.qcow2 -popd > /dev/null -- cgit 1.2.3-korg