From 5fd55dbd8161ef5ae32060b6e52ab98bdbfebab2 Mon Sep 17 00:00:00 2001
From: alexey-mr <alexey.morlang@gmail.com>
Date: Mon, 14 Nov 2016 12:31:58 +0300
Subject: [PATCH] Use FTP server as a source with ScaleIO packages

Change-Id: If54a55ecad474841fb69aa5647ac3963ba3df60f
---
 .../puppet/manifests/gateway_server.pp        |  1 +
 .../puppet/manifests/mdm_package.pp           |  3 +-
 .../puppet/manifests/sdc_server.pp            |  1 +
 .../puppet/manifests/sds_server.pp            |  2 ++
 environment_config.yaml                       | 13 +++-----
 pre_build_hook                                | 33 -------------------
 6 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/gateway_server.pp b/deployment_scripts/puppet/manifests/gateway_server.pp
index 3929c87..e7c9883 100644
--- a/deployment_scripts/puppet/manifests/gateway_server.pp
+++ b/deployment_scripts/puppet/manifests/gateway_server.pp
@@ -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':
diff --git a/deployment_scripts/puppet/manifests/mdm_package.pp b/deployment_scripts/puppet/manifests/mdm_package.pp
index 798e2d7..c2a9f52 100644
--- a/deployment_scripts/puppet/manifests/mdm_package.pp
+++ b/deployment_scripts/puppet/manifests/mdm_package.pp
@@ -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': }
diff --git a/deployment_scripts/puppet/manifests/sdc_server.pp b/deployment_scripts/puppet/manifests/sdc_server.pp
index 841991c..ae05d90 100644
--- a/deployment_scripts/puppet/manifests/sdc_server.pp
+++ b/deployment_scripts/puppet/manifests/sdc_server.pp
@@ -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}": }
diff --git a/deployment_scripts/puppet/manifests/sds_server.pp b/deployment_scripts/puppet/manifests/sds_server.pp
index 0e181da..6192785 100644
--- a/deployment_scripts/puppet/manifests/sds_server.pp
+++ b/deployment_scripts/puppet/manifests/sds_server.pp
@@ -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,
diff --git a/environment_config.yaml b/environment_config.yaml
index 9d7e6dc..484c118 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -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"
 
diff --git a/pre_build_hook b/pre_build_hook
index 8b16709..444a175 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -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
 ##############################################################################