Change plugin infra to support 7.0
Change-Id: I17a178aa82599fcdf59fc57fa9482faca8f7be27
This commit is contained in:
parent
9839f9f935
commit
d348d464a7
2
build.sh
2
build.sh
|
@ -26,7 +26,7 @@ fail_on_error "Mellanox plugin build script supports only Redhat/CentOS 6"
|
|||
|
||||
readonly TOP_DIR=`dirname $0`
|
||||
readonly TMP_DIR='/tmp'
|
||||
readonly PLUGIN_BUILDER_DIR="$TMP_DIR/fuel-plugins/fuel_plugin_builder"
|
||||
readonly PLUGIN_BUILDER_DIR="$TMP_DIR/fuel-plugins/"
|
||||
readonly PLUGIN_BUILDER_PACKAGE_DIR="$PLUGIN_BUILDER_DIR/dist"
|
||||
pushd $TOP_DIR > /dev/null
|
||||
|
||||
|
|
|
@ -5,19 +5,19 @@ name: mellanox-plugin
|
|||
title: Mellanox Openstack features
|
||||
|
||||
# Plugin version
|
||||
version: 1.0.1
|
||||
version: 1.0.2
|
||||
|
||||
# Description
|
||||
description: Enable features over Mellanox hardware
|
||||
|
||||
# Required fuel version
|
||||
fuel_version: ['6.1']
|
||||
fuel_version: ['6.1', '7.0']
|
||||
|
||||
# Specify license of your plugin
|
||||
licenses: ['Apache License Version 2.0']
|
||||
|
||||
# Specify author or company name
|
||||
authors: ['gilmeir@mellanox.com', 'aviramb@mellanox.com']
|
||||
authors: ['aviramb@mellanox.com', 'rawanh@mellanox.com']
|
||||
|
||||
# A link to the plugin's page
|
||||
homepage: 'https://github.com/stackforge/fuel-plugin-mellanox/'
|
||||
|
@ -37,6 +37,16 @@ releases:
|
|||
mode: ['ha']
|
||||
deployment_scripts_path: deployment_scripts/
|
||||
repository_path: repositories/centos
|
||||
- os: ubuntu
|
||||
version: 2015.1.0-7.0
|
||||
mode: ['ha']
|
||||
deployment_scripts_path: deployment_scripts/
|
||||
repository_path: repositories/ubuntu
|
||||
- os: centos
|
||||
version: 2015.1.0-7.0
|
||||
mode: ['ha']
|
||||
deployment_scripts_path: deployment_scripts/
|
||||
repository_path: repositories/centos
|
||||
|
||||
# Version of plugin package
|
||||
package_version: '2.0.0'
|
||||
|
|
|
@ -16,16 +16,7 @@
|
|||
|
||||
readonly PLUGIN_DIR="$(dirname $0)"
|
||||
readonly PLUGIN_VERSION=`cat $PLUGIN_DIR/.version`
|
||||
readonly LOCAL_REPOSITORY_PATH='10.212.14.8/mellanox_plugin/'
|
||||
readonly PUBLIC_REPOSITORY_PATH='www.mellanox.com/repository/solutions/openstack/mellanox_fuel_plugin/'
|
||||
|
||||
if [ -z "$REPOSITORY_PATH" ]; then
|
||||
if wget -q --spider $LOCAL_REPOSITORY_PATH; then
|
||||
REPOSITORY_PATH=$LOCAL_REPOSITORY_PATH
|
||||
else
|
||||
REPOSITORY_PATH=$PUBLIC_REPOSITORY_PATH
|
||||
fi
|
||||
fi
|
||||
readonly REPOSITORY_PATH='bgate.mellanox.com/openstack/mellanox_fuel_plugin/'
|
||||
|
||||
function download {
|
||||
FILE_TYPE=$1
|
||||
|
@ -74,14 +65,15 @@ rpm_files="cirros-testvm-mellanox-0.3.2-1.mira3.x86_64.rpm
|
|||
mlnx-dnsmasq-2014.2.2-1.noarch.rpm
|
||||
mlnx-ofed-fuel-2.3-2.0.8.el6.x86_64.rpm
|
||||
redhat-rpm-config-9.0.3-42.el6.centos.noarch.rpm"
|
||||
get_packages "rpm" "$old_rpms" "$rpm_files"
|
||||
#get_packages "rpm" "$old_rpms" "$rpm_files" # CentOS is not supported in 7.0
|
||||
|
||||
old_debs="${PLUGIN_DIR}/repositories/ubuntu/*.deb"
|
||||
deb_files="cirros-testvm-mellanox_0.3.2-ubuntu3_amd64.deb
|
||||
cirros-testvm-mellanox-ib_0.3.2-7_amd64.deb
|
||||
eswitchd_0.11-5_amd64.deb
|
||||
mlnx-dnsmasq_2014.2.2-1_all.deb
|
||||
mlnx-ofed-fuel_2.3-2.0.8_amd64.deb"
|
||||
eswitchd_0.13-1_amd64.deb
|
||||
mlnx-dnsmasq_2015.1.0-1_all.deb
|
||||
mlnx-ofed-fuel_2.3-2.0.8_amd64.deb
|
||||
python-networking-mlnx_2015.1.2-1_amd64.deb"
|
||||
get_packages "deb" "$old_debs" "$deb_files"
|
||||
|
||||
bootstrap_dir="${PLUGIN_DIR}/bootstrap/"
|
||||
|
@ -89,4 +81,4 @@ bootstrap_files="initramfs.img
|
|||
linux
|
||||
ofed
|
||||
kernel"
|
||||
get_packages "bootstrap" "$bootstrap_dir" "$bootstrap_files"
|
||||
#get_packages "bootstrap" "$bootstrap_dir" "$bootstrap_files" # Using original bootstrap in 7.0
|
||||
|
|
Loading…
Reference in New Issue