Merge pull request #116 from StackStorm/build_server_param

Parameterize download server URL
StackStorm · Nov 3, 2015 · 3b5981e · 3b5981e
2 parents b070dcd + 60fd043
commit 3b5981e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.10.17 (Nov 2, 2015)
+* Parameterized download server to CI
+
 ## 0.10.16 (Oct 30, 2015)
 * Set sticky bit on Group, not User for stackstorm packs dir
 

diff --git a/manifests/auth/pam.pp b/manifests/auth/pam.pp
@@ -25,7 +25,7 @@
   }
 
   wget::fetch { "Download auth pam backend":
-    source             => "https://downloads.stackstorm.net/st2community/${distro_path}/auth_backends/st2_auth_backend_pam-${version}-py2.7.egg",
+    source             => "${::st2::repo_base}/st2community/${distro_path}/auth_backends/st2_auth_backend_pam-${version}-py2.7.egg",
     cache_dir          => '/var/cache/wget',
     nocheckcertificate => true,
     destination        => "/tmp/st2_auth_backend_pam-${version}-py2.7.egg"

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -50,6 +50,7 @@
   $revision                 = '5',
   $autoupdate               = false,
   $mistral_git_branch       = 'st2-1.1.0',
+  $repo_base                = $::st2::params::repo_base,
   $conf_dir                 = $::st2::params::conf_dir,
   $conf_file                = "${::st2::params::conf_dir}/st2.conf",
   $use_ssl                  = false,

diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
@@ -21,11 +21,11 @@
   }
 
   apt::source { 'stackstorm':
-    location    => 'https://downloads.stackstorm.net/deb/',
+    location    => "${::st2::repo_base}/deb/",
     release     => "${::lsbdistcodename}_${_suite}",
     repos       => 'main',
     include_src => false,
     key         => '1E26DCC8B9D4E6FCB65CC22E40A96AE06B8C7982',
-    key_source  => 'https://downloads.stackstorm.net/deb/pubkey.gpg',
+    key_source  => "${::st2::repo_base}/deb/pubkey.gpg",
   }
 }
diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -21,7 +21,7 @@
 
   yumrepo { 'stackstorm':
     ensure   => present,
-    baseurl  => "https://downloads.stackstorm.net/rpm/el/${_osver}/${_suite}",
+    baseurl  => "${::st2::repo_base}/rpm/el/${_osver}/${_suite}",
     descr    => 'StackStorm RPM Repository',
     enabled  => 1,
     gpgcheck => 0,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -75,6 +75,8 @@
     st2web             => 'st2web',
   }
 
+  $repo_base = 'https://downloads.stackstorm.net'
+
   # Auth settings
   $auth_mode = standalone
   $auth_backend = pam

diff --git a/manifests/profile/web.pp b/manifests/profile/web.pp
@@ -47,7 +47,7 @@
 
   if $autoupdate or ! $_bootstrapped {
     wget::fetch { 'st2web':
-      source      => "http://downloads.stackstorm.net/releases/st2/${_version}/webui/webui-${_version}.tar.gz",
+      source      => "${::st2::repo_base}/releases/st2/${_version}/webui/webui-${_version}.tar.gz",
       cache_dir   => '/var/cache/wget',
       destination => '/tmp/st2web.tar.gz',
       before      => Exec['extract webui'],

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "stackstorm-st2",
-  "version": "0.10.16",
+  "version": "0.10.17",
   "author": "stackstorm",
   "summary": "Puppet module to manage/configure StackStorm",
   "license": "Apache 2.0",