Use FTP server as a source with ScaleIO packages

Change-Id: If54a55ecad474841fb69aa5647ac3963ba3df60f
This commit is contained in:
alexey-mr 2016-11-14 12:31:58 +03:00
parent 196f1ba1e1
commit 5fd55dbd81
6 changed files with 11 additions and 42 deletions

View File

@ -18,6 +18,7 @@ if $scaleio['metadata']['enabled'] {
ensure => 'present',
mdm_ips => $::managers_ips,
password => $scaleio['password'],
pkg_ftp => $scaleio['pkg_ftp'],
} ->
notify { "Configure Haproxy for Gateway nodes: ${gw_ips}": } ->
openstack::ha::haproxy_service { 'scaleio-gateway':

View File

@ -10,7 +10,8 @@ if $scaleio['metadata']['enabled'] {
{
notify {'Mdm server installation': } ->
class {'::scaleio::mdm_server':
ensure => 'present',
ensure => 'present',
pkg_ftp => $scaleio['pkg_ftp'],
}
} else {
notify{'Skip deploying mdm server because it is not controller': }

View File

@ -14,6 +14,7 @@ if $scaleio['metadata']['enabled'] {
class {'::scaleio::sdc_server':
ensure => 'present',
mdm_ip => undef,
pkg_ftp => $scaleio['pkg_ftp'],
}
} else{
notify {"Skip SDC server task on the node ${::hostname}": }

View File

@ -56,6 +56,7 @@ if $scaleio['metadata']['enabled'] {
class {'::scaleio::sds_server':
ensure => 'present',
xcache => $use_xcache,
pkg_ftp => $scaleio['pkg_ftp'],
}
} else {
# save devices in shared DB
@ -104,6 +105,7 @@ if $scaleio['metadata']['enabled'] {
class {'::scaleio::sds_server':
ensure => 'present',
xcache => $use_xcache,
pkg_ftp => $scaleio['pkg_ftp'],
} ->
package {'mysql-client':
ensure => present,

View File

@ -322,13 +322,10 @@ attributes:
- condition: "settings:scaleio.existing_cluster.value == true or cluster:fuel_version == '6.1' or cluster:fuel_version == '7.0' or cluster:fuel_version == '8.0'"
action: hide
version:
type: "select"
pkg_ftp:
type: "text"
value: "ftp://QNzgdxXix:Aw3wFAwAq3@ftp.emc.com/Ubuntu/2.0.7536.0"
label: "FTP server with ScaleIO packages"
description: "In case of no internet connection set this option to a local FTP server with appropriate folder structure."
weight: 200
value: "2.0"
label: "Version"
description: "Select the ScaleIO version you wish to install. The only version 2.0 is supported for now."
values:
- data: "2.0"
label: "2.0"

View File

@ -13,41 +13,8 @@ set -eux
RELEASE=${RELEASE_TAG:-"v1.1.4"}
#TODO: use ftp.emc.com
BASE_REPO_URL="http://scaleio-packages.s3-website-us-east-1.amazonaws.com"
BASE_PUPPET_URL="https://github.com/codedellemc"
##############################################################################
# Download packages for plugin
##############################################################################
PLATFORMS=(ubuntu centos)
PLATFORMS_PKG_SUFFIX=(deb rpm)
PLATFORMS_REPO_URL_SUFFIX=("pool/main/e" "centos/x86_64/RPMS")
for r in {0..1}
do
platform=${PLATFORMS[$r]}
repo_suffix=${PLATFORMS_REPO_URL_SUFFIX[$r]}
pkg_suffix=${PLATFORMS_PKG_SUFFIX[$r]}
repo_url="$BASE_REPO_URL/$platform/$repo_suffix/"
destination="./repositories/$platform"
components=`curl --silent "$repo_url" | grep -o 'emc-scaleio-\w\+' | sort| uniq`
for i in $components;
do
packages=`curl --silent "$repo_url$i/" | grep -o "$i[a-zA-Z0-9_.-]\+\.$pkg_suffix" | sort | uniq`
for p in $packages
do
if [[ ! -f "$destination/$p" || ! -z "${FORCE_DOWNLOAD+x}" ]]
then
wget -P "$destination/" "$repo_url$i/$p"
fi
done
done
done
##############################################################################
# Download required puppet modules
##############################################################################