Merge "Updates release-notes for Colorado 1.0 release"

[apex.git] / build / overcloud-onos.sh

diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index d59be0a..7b5e3df 100755 (executable)
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -19,12 +19,12 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
 #######################################
 
 # upgrade ovs into ovs 2.5.90 with NSH function
-curl -L -O ${onos_ovs_uri}/package_ovs_rpm.tar.gz
-tar -xzf package_ovs_rpm.tar.gz
-LIBGUESTFS_BACKEND=direct virt-customize --upload openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm:/root/ \
-                                         --run-command "yum install -y /root/openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm" \
-                                         --upload openvswitch-2.5.90-1.el7.centos.x86_64.rpm:/root/ \
-                                         --run-command "yum upgrade -y /root/openvswitch-2.5.90-1.el7.centos.x86_64.rpm" \
+curl -L -O ${onos_ovs_uri}/${onos_ovs_pkg}
+tar -xzf ${onos_ovs_pkg}
+LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \
+                                         --run-command "yum install -y /root/${ovs_kmod_rpm_name}" \
+                                         --upload ${ovs_rpm_name}:/root/ \
+                                         --run-command "yum upgrade -y /root/${ovs_rpm_name}" \
                                          -a overcloud-full-onos_build.qcow2