Merge pull request #335 from rush-skills/master

Ubuntu 20.04 and refactoring

Author: nmaludy

.github/workflows/build.yaml

@@ -1,6 +1,7 @@
 name: build
 
 on:
+  workflow_dispatch:
   push:
     branches: ['*']
     tags:
@@ -122,16 +123,14 @@ jobs:
             name: 'centos7-puppet7'
           - ruby: '2.7'
             name: 'centos7-puppet7-python36'
-          - ruby: '2.7'
-            name: 'ubuntu16-puppet6'
-          - ruby: '2.7'
-            name: 'ubuntu16-puppet7'
-          - ruby: '2.7'
-            name: 'ubuntu16-puppet7-python36'
           - ruby: '2.7'
             name: 'ubuntu18-puppet6'
           - ruby: '2.7'
             name: 'ubuntu18-puppet7'
+          - ruby: '2.7'
+            name: 'ubuntu20-puppet6'
+          - ruby: '2.7'
+            name: 'ubuntu20-puppet7'
     env:
       CHECK: '${{ matrix.check }}'
     steps:

.kitchen.yml

@@ -73,61 +73,49 @@ platforms:
       puppetfile_path: build/centos7-puppet7/Puppetfile
       manifest: test/fullinstall_python36.pp
 
-  # Ubuntu Xenial with Systemd - Puppet 6
-  - name: ubuntu16-puppet6
-    driver:
-      platform: ubuntu
-      dockerfile: build/ubuntu16-puppet6/Dockerfile.kitchen
-      run_command: /sbin/init
-      volume:
-        - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    provisioner:
-      puppetfile_path: build/ubuntu16-puppet6/Puppetfile
-
-  # Ubuntu Xenial with Systemd - Puppet 7
-  - name: ubuntu16-puppet7
+  # Ubuntu Bionic with Systemd - Puppet 6
+  - name: ubuntu18-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu18-puppet6/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu16-puppet7/Puppetfile
+      puppetfile_path: build/ubuntu18-puppet6/Puppetfile
 
-  # Ubuntu Xenial with Systemd - Puppet 7 - Python 3.6
-  - name: ubuntu16-puppet7-python36
+  # Ubuntu Bionic with Systemd - Puppet 7
+  - name: ubuntu18-puppet7
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu16-puppet7/Puppetfile
-      manifest: test/fullinstall_python36.pp
+      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
 
-  # Ubuntu Bionic with Systemd - Puppet 6
-  - name: ubuntu18-puppet6
+  # Ubuntu Focal with Systemd - Puppet 6
+  - name: ubuntu20-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu18-puppet6/Dockerfile.kitchen
+      dockerfile: build/ubuntu20-puppet6/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu18-puppet6/Puppetfile
+      puppetfile_path: build/ubuntu20-puppet6/Puppetfile
 
-  # Ubuntu Bionic with Systemd - Puppet 7
-  - name: ubuntu18-puppet7
+  # Ubuntu Focal with Systemd - Puppet 7
+  - name: ubuntu20-puppet7
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu18-puppet7/Dockerfile.kitchen
+      dockerfile: build/ubuntu20-puppet7/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu18-puppet7/Puppetfile
+      puppetfile_path: build/ubuntu20-puppet7/Puppetfile
 
 suites:
   - name: default

.pdkignore

@@ -36,7 +36,6 @@
 /rakelib/
 /.rspec
 /.rubocop.yml
-/.travis.yml
 /.yardopts
 /spec/
 /.vscode/

.sync.yml

@@ -13,9 +13,6 @@
 .gitlab-ci.yml:
   # we don't use GitLab
   unmanaged: true
-.travis.yml:
-  # we keep our own .travis.yml because of integration testing
-  unmanaged: true
 .vscode/extensions.json:
   # we don't use VSCode
   unmanaged: true

.travis-switch-to-github-actions.yml

@@ -2,6 +2,19 @@
 
 ## Development
 
+- Remove tests for Ubuntu 18.04 and Python3.6, since it's already default. Contributed by @rush-skills.
+
+- Drop support for ubuntu 16.04 and add support for ubuntu 20.04. Contributed by @rush-skills
+
+- Update build docs. Contributed by @rush-skills
+
+- Change old style fact reference in selinux profile. Contributed by @rush-skills
+
+- Cleaned up old style `::` references. Contributed by @rush-skills
+
+- Removed travis references after switch to GitHub Actions. Contributed by @rush-skills
+
+- Removed `files/etc/st2/st2.conf` as the template was no longer used. Contributed by @rush-skills
 
 ## 2.2.0 (Jul 14, 2021)
 

CHANGELOG.md

@@ -49,6 +49,7 @@ The `st2` module configures the existing into a complete and dedicated StackStor
  * MongoDB
  * Postgres
  * RabbitMQ
+ * Redis
  * Nginx
  * NodeJS
 
@@ -69,10 +70,10 @@ and [librarian-puppet](http://librarian-puppet.com/).
 
  * RHEL/CentOS 7 - Puppet 6 - [build/centos7-puppet6/Puppetfile](build/centos7-puppet6/Puppetfile)
  * RHEL/CentOS 7 - Puppet 7 - [build/centos7-puppet7/Puppetfile](build/centos7-puppet7/Puppetfile)
- * Ubuntu 16.04 - Puppet 6 - [build/ubuntu16-puppet6/Puppetfile](build/ubuntu16-puppet6/Puppetfile)
- * Ubuntu 16.04 - Puppet 7 - [build/ubuntu16-puppet7/Puppetfile](build/ubuntu16-puppet7/Puppetfile)
  * Ubuntu 18.04 - Puppet 6 - [build/ubuntu18-puppet6/Puppetfile](build/ubuntu18-puppet6/Puppetfile)
  * Ubuntu 18.04 - Puppet 7 - [build/ubuntu18-puppet7/Puppetfile](build/ubuntu18-puppet7/Puppetfile)
+ * Ubuntu 20.04 - Puppet 6 - [build/ubuntu20-puppet6/Puppetfile](build/ubuntu20-puppet6/Puppetfile)
+ * Ubuntu 20.04 - Puppet 7 - [build/ubuntu20-puppet7/Puppetfile](build/ubuntu20-puppet7/Puppetfile)
 
 ### Beginning with st2
 
@@ -118,28 +119,16 @@ Hiera data bindings. A few notable parameters to take note of:
   **Notes**
     * RHEL 7 - The Red Hat subscription repo `'rhel-7-server-optional-rpms'`
       will need to be enabled prior to running this module.
-    * :warning: Ubuntu 16.04 -
-      The python3.6 package is a required dependency for the StackStorm `st2` package
-      but that is not installable from any of the default Ubuntu 16.04 repositories.
-      We recommend switching to Ubuntu 18.04 LTS (Bionic) as a base OS. Support for
-      Ubuntu 16.04 will be removed with future StackStorm versions.
-      Alternatively the Puppet will try to add python3.6 from the 3rd party 'deadsnakes' repository: https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa.
-      Only set to true, if you are aware of the support and security risks associated
-      with using unofficial 3rd party PPA repository, and you understand that StackStorm
-      does NOT provide ANY support for python3.6 packages on Ubuntu 16.04.
-      The unsafe PPA `'ppa:deadsnakes/ppa'` https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa
-      can be enabled if you specify the `st2::python_enable_unsafe_repo: true` (default: `false`)
 
   ```puppet
   # CentOS/RHEL 7
   class { 'st2':
     python_version => '3.6',
   }
 
-  # Ubuntu 16.04 (unsafe deadsnakes PPA will be enabled because of boolean flag)
+  # Ubuntu 18.04/20.04
   class { 'st2':
     python_version            => 'python3.6',
-    python_enable_unsafe_repo => true,
   }
 
   contain st2::profile::fullinstall
@@ -224,7 +213,7 @@ The following backends are currently available:
 
 
 By default the `flat_file` backend is used. To change this you can configure it
-when instantiating the `::st2` class in a manifest file:
+when instantiating the `st2` class in a manifest file:
 
 ``` ruby
 class { 'st2':
@@ -244,7 +233,7 @@ found by looking at the backend class in the `manifests/st2/auth/` directory.
 These parameters map 1-for-1 to the configuration options defined in each
 backends GitHub page (links above). Backend configurations are passed in as a hash
 using the `auth_backend_config` option. This option can be changed when instantiating
-the `::st2` class in a manifest file:
+the `st2` class in a manifest file:
 
 ``` ruby
 class { 'st2':
@@ -445,8 +434,8 @@ $res = run_task('st2::key_get', $stackstorm_target,
 
 ### Supported platforms
 
-* Ubuntu 16.04
 * Ubuntu 18.04
+* Ubuntu 20.04
 * RHEL/CentOS 7
 
 ### Supported Puppet versions
@@ -461,6 +450,12 @@ Support for Mistral has been dropped as of StackStorm `3.3.0`.
 As of version `1.8` this module no longer supports Mistral (and subsequently PostgreSQL)
 Neither Mistral nor Postgresql will be installed or managed by this module.
 
+#### :warning: End-of-Support Notice - Ubuntu 16.04
+
+Support for Ubuntu 16.04 has been dropped as of StackStorm `3.5.0`
+
+As of version `2.3` this module no longer supports Ubuntu 16.04
+
 #### :warning: End-of-Support Notice - CentOS 6
 
 Support for CentOS 6 has been dropped as of StackStorm `3.3.0`.