Merge remote-tracking branch 'origin/feature/tasks' into feature/tasks

Author: nmaludy

CHANGELOG.md

@@ -11,6 +11,22 @@
    - `st2::pack_list` - Get a list of installed packs
    - `st2::pack_remove` - Removes a list of packs
   (Feature)
+
+- Fixed build for new release of `puppet/nginx` causing conflict with `puppetlabs/stdlib`.
+  The new version `0.16.0` of `puppet/nginx` requires `puppetlabs/stdlib >= 5.0.0`.
+  Several other modules we depend on require `puppetlabs/stdlib < 5.0.0` causing a conflict.
+  To fix this, we've pinned `puppet/nginx` to `0.15.0` in the Puppetfiles used
+  for testing. (Bugfix)
+  Contributed by @nmaludy
+  
+- Removed the dependencies because they're no longer used.
+    - `puppet/staging`
+    - `puppetlabs/gcc`
+  (Enhancement)
+  Contributed by @nmaludy
+
+- Puppet 4 is officially deprecated due to it being End of Life on 2018-12-31.
+  Support will be removed in a future version. (Enhancement)
   Contributed by @nmaludy
 
 - Fixed build for Puppet 4. New version of rubygem-update requires Ruby 2.3.0
@@ -196,7 +212,7 @@
   Contributed by @nmaludy
 
 - Changed the behavior of `st2` packages. Previously they were automatically
-  updating due to the package resources having `ensure => latest` set. Going
+  updating due to the package resources having `ensure  latest` set. Going
   forward, packages will have `ensure => present` set by default  and it will be
   the responsibility of the end user to update the packages. (Change)
   Contributed by @nmaludy

README.md

@@ -26,6 +26,13 @@ puppet module install stackstorm-st2
 puppet apply -e "include ::st2::profile::fullinstall"
 ```
 
+## :warning: Deprecation Notice - Puppet 4
+
+Puppet 4 reached End of Life on 2018-12-31. As of version `1.4` use of Puppet 4 with this module
+is officially deprecated. The next minor release of the module will drop support
+for Puppet 4 in the CI testing matrix. The next major release of the module will drop
+support for Puppet 4 by adjusting the minimum supported Puppet version in `metadata.json`.
+
 ## :warning: Deprecation Notice - Puppet 3
 
 **This module no longer supports Puppet 3 as of version `1.1`**

build/centos6-puppet4/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/centos6-puppet5/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/centos6-puppet6/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/centos7-puppet4/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/centos7-puppet5/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/centos7-puppet6/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/ubuntu14-puppet4/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/ubuntu14-puppet5/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/ubuntu14-puppet6/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/ubuntu16-puppet4/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/ubuntu16-puppet5/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

build/ubuntu16-puppet6/Puppetfile

@@ -11,20 +11,19 @@ forge "https://forgeapi.puppetlabs.com"
 
 mod 'puppet/rabbitmq'
 mod 'jamtur01/httpauth'
-mod 'puppet/staging'
 mod 'puppet/wget'
 mod 'saz/sudo'
 mod 'puppet/python'
-mod 'puppetlabs/gcc'
 mod 'puppetlabs/inifile'
 mod 'puppet/mongodb'
 mod 'puppetlabs/postgresql'
 mod 'stahnma/epel'
 mod 'ghoneycutt/facter'
 mod 'computology/packagecloud'
-mod "puppet/selinux"
-mod 'puppet/nginx'
+mod 'puppet/selinux'
+# hard coding 0.15.0 because it requires stdlib >= 5.0.0
+# several other dependencies require stdlib < 5.0.0 causing a conflict
+mod 'puppet/nginx', '0.15.0'
 mod 'puppet/nodejs'
 mod 'puppetlabs/apt'
-mod 'puppetlabs/concat'
 mod 'puppetlabs/stdlib'

metadata.json

@@ -16,10 +16,6 @@
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.6.0"
     },
-    {
-      "name": "puppet/staging",
-      "version_requirement": ">= 1.0.2"
-    },
     {
       "name": "puppetlabs/apt",
       "version_requirement": ">= 1.7.0"
@@ -36,10 +32,6 @@
       "name": "puppet/python",
       "version_requirement": ">= 1.10.0"
     },
-    {
-      "name": "puppetlabs/gcc",
-      "version_requirement": ">= 0.2.0"
-    },
     {
       "name": "puppetlabs/inifile",
       "version_requirement": ">= 1.2.0"
@@ -106,4 +98,4 @@
   "pdk-version": "1.8.0",
   "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
   "template-ref": "1.8.0-0-g0d9da00"
-}
+}