Change destination of snmp mibs files from

[apex.git] / ci / deploy.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index a395598..f1a807f 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -28,8 +28,8 @@ dnslookup_site="www.google.com"
 post_config="TRUE"
 debug="FALSE"
 
-ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm
-ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm
+ovs_rpm_name=openvswitch-2.6.1-1.el7.centos.x86_64.rpm
+ovs_kmod_rpm_name=openvswitch-kmod-2.6.1-1.el7.centos.x86_64.rpm
 
 declare -i CNT
 declare UNDERCLOUD
@@ -37,19 +37,6 @@ declare -A deploy_options_array
 declare -a performance_options
 declare -A NET_MAP
 
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
-    echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
-    echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
-    BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
-    echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
-    echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
-    IMAGES=$RESOURCES
-fi
-
 APEX_TMP_DIR=$(python3 -c "import tempfile; print(tempfile.mkdtemp())")
 SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error)
 DEPLOY_OPTIONS=""
@@ -82,7 +69,6 @@ $LIB/undercloud-functions.sh
 $LIB/overcloud-deploy-functions.sh
 $LIB/post-install-functions.sh
 $LIB/utility-functions.sh
-$LIB/installer/onos/onos_gw_mac_update.sh
 )
 for lib_file in ${lib_files[@]}; do
   if ! source $lib_file; then
@@ -265,14 +251,6 @@ main() {
       echo -e "${blue}INFO: Post Install Configuration Complete${reset}"
     fi
   fi
-  if [[ "${deploy_options_array['sdn_controller']}" == 'onos' ]]; then
-    if ! onos_update_gw_mac ${external_cidr} ${external_gateway}; then
-      echo -e "${red}ERROR:ONOS Post Install Configuration Failed, Exiting.${reset}"
-      exit 1
-    else
-      echo -e "${blue}INFO: ONOS Post Install Configuration Complete${reset}"
-    fi
-  fi
 }
 
 main "$@"