Merge pull request #253 from StackStorm/feature/configurable-release

Added release parameter to allow installing from unstable

CHANGELOG.md

@@ -1,6 +1,26 @@
 # Changelog
 
 ## Development
+
+- Added authentication for RabbitMQ, by default.
+  The authentication options are available in the `::st2` class:
+    - `rabbitmq_username` : Username for the new RabbitMQ user (default: `st2admin`)
+    - `rabbitmq_password` : Password for the new RabbitMQ user (default: `Ch@ngMe`)
+  When upgrading to this new version, this will force a restart of all StackStorm
+  and Mistral services as the new password is applied. (Feature)
+  Contributed by @nmaludy
+
+- Remove the insecure RabbitMQ default `guest` user on RabbitMQ instances. 
+  Note: this will remove this user on new AND existing instances. (Enhancement)
+  Contributed by @nmaludy
+
+- Added support for additional RabbitMQ configuration options:
+    - `rabbitmq_hostname` : Hostname of the RabbitMQ server (default: `127.0.0.1`)
+    - `rabbitmq_port` : Port to connect to the RabbitMQ server (default: `5672`)
+    - `rabbitmq_bind_ip` : IP address to bind the RabbitMQ server to (default: `127.0.0.1`)
+    - `rabbitmq_vhost` : Virtual Host for the StackStorm content on RabbitMQ (default: `/`)
+  (Feature)
+  Contributed by @nmaludy
 
 - Added support for `st2scheduler` service in StackStorm >= `2.10.0`.
   Two new options were added to `::st2`:
@@ -22,6 +42,13 @@
   #219 (Enhancement)
   Contributed by @nmaludy
 
+- Added new parameter to `::st2` class `repository` that allows configuring a different
+  release repository from PackageCloud for Yum/Apt. Available options are:
+      - `'stable'` (default)
+      - `'unstable'`
+  (Enhancement)
+  Contributed by @nmaludy
+
 ## 1.2.0 (Sep 25, 2018)
 
 - Removed `manifests/container.pp` and `manifests/profile/source.pp`. These files
@@ -58,26 +85,6 @@
   on RHEL/CentOS installs. (Bugfix)
   Contributed by @nmaludy
 
-- Added authentication for RabbitMQ, by default.
-  The authentication options are available in the `::st2` class:
-    - `rabbitmq_username` : Username for the new RabbitMQ user (default: `st2admin`)
-    - `rabbitmq_password` : Password for the new RabbitMQ user (default: `Ch@ngMe`)
-  When upgrading to this new version, this will force a restart of all StackStorm
-  and Mistral services as the new password is applied. (Feature)
-  Contributed by @nmaludy
-
-- Remove the insecure RabbitMQ default `guest` user on RabbitMQ instances. 
-  Note: this will remove this user on new AND existing instances. (Enhancement)
-  Contributed by @nmaludy
-
-- Added support for additional RabbitMQ configuration options:
-    - `rabbitmq_hostname` : Hostname of the RabbitMQ server (default: `127.0.0.1`)
-    - `rabbitmq_port` : Port to connect to the RabbitMQ server (default: `5672`)
-    - `rabbitmq_bind_ip` : IP address to bind the RabbitMQ server to (default: `127.0.0.1`)
-    - `rabbitmq_vhost` : Virtual Host for the StackStorm content on RabbitMQ (default: `/`)
-  (Feature)
-  Contributed by @nmaludy
-
 ## 1.1.0 (Sep 07, 2018)
 
 - DEPRECATION WARNING - Dropped support for Puppet 3. (Enhancement)

manifests/init.pp

@@ -8,6 +8,8 @@
 #  [*version*]              - Version of StackStorm package to install (default = 'present')
 #                             See the package 'ensure' property:
 #                             https://puppet.com/docs/puppet/5.5/types/package.html#package-attribute-ensure
+#  [*repository*]           - Release repository to enable. 'stable', 'unstable'
+#                             (default = 'stable')
 #  [*mistral_git_branch*]   - Tagged branch of Mistral to download/install
 #  [*conf_file*]            - The path where st2 config is stored
 #  [*use_ssl*]              - Enable/Disable SSL for all st2 APIs
@@ -125,6 +127,7 @@
 #
 class st2(
   $version                  = 'present',
+  $repository               = $::st2::params::repository,
   $mistral_git_branch       = 'st2-1.2.0',
   $conf_dir                 = $::st2::params::conf_dir,
   $conf_file                = "${::st2::params::conf_dir}/st2.conf",

manifests/params.pp

@@ -48,6 +48,7 @@
   $api_port = 9101
 
   # Non-user configurable parameters
+  $repository = 'stable'
   $conf_dir = '/etc/st2'
   $datstore_keys_dir = "${conf_dir}/keys"
 

manifests/profile/repos.pp

@@ -1,28 +1,29 @@
-# == Class: st2::profile::python
+# @summary Manages the installation of st2 required repos for installing the StackStorm packages.
 #
-# Installation of st2 required repos
+# @example Basic usage
+#   include ::st2::profile::repos
 #
-# === Parameters
+# @example Installing from unstable
+#   class { '::st2::profile::repos':
+#     repository => 'unstable',
+#   }
 #
-#  This module contains no parameters
-#
-# === Variables
-#
-#  This module contains no variables
-#
-# === Examples
-#
-#  include st2::profile::repos
+# @param repository
+#   Release repository to enable. Options: 'stable', 'unstable'.
+# @param package_type
+#   Type of package management system used for repo. Options: 'rpm', 'deb'
 #
 class st2::profile::repos(
-  $package_type = $st2::params::package_type
-) {
+  $repository   = $::st2::repository,
+  $package_type = $::st2::params::package_type,
+) inherits st2 {
   require ::packagecloud
 
   if $::osfamily == 'RedHat' {
     require ::epel
   }
-  packagecloud::repo { 'StackStorm/stable':
+  $_packagecloud_repo = "StackStorm/${repository}"
+  packagecloud::repo { $_packagecloud_repo:
     type => $package_type,
   }
 
@@ -34,7 +35,7 @@
       command     =>  'rm -rf /var/lib/apt/lists/*; apt-get update',
       path        => ['/usr/bin/', '/bin/'],
       refreshonly => true,
-      subscribe   => Packagecloud::Repo['StackStorm/stable'],
+      subscribe   => Packagecloud::Repo[$_packagecloud_repo],
     }
   }
 }