Merge pull request #281 from StackStorm/feature/ubuntu18

Ubuntu 18.04

Author: nmaludy

.kitchen.yml

@@ -80,61 +80,49 @@ platforms:
     provisioner:
       puppetfile_path: build/centos7-puppet6/Puppetfile
 
-  # Ubuntu Trusty with Upstart - Puppet 5
-  - name: ubuntu14-puppet5
+  # Ubuntu Xenial with Systemd - Puppet 5
+  - name: ubuntu16-puppet5
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu14-puppet5/Dockerfile.kitchen
-      disable_upstart: false
+      dockerfile: build/ubuntu16-puppet5/Dockerfile.kitchen
       run_command: /sbin/init
+      volume:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu14-puppet5/Puppetfile
-      # Due to issues with running apt-get during 'docker build' on Ubuntu 14,
-      # we need to install Puppet once the container has started.
-      # Good news, kitchen-puppet supports this with the following commands:
-      require_puppet_omnibus: true
-      require_puppet_collections: true
-      require_puppet_repo: false
-      puppet_omnibus_url: https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_5_agent.sh
+      puppetfile_path: build/ubuntu16-puppet5/Puppetfile
 
-  # Ubuntu Trusty with Upstart - Puppet 6
-  - name: ubuntu14-puppet6
+  # Ubuntu Xenial with Systemd - Puppet 6
+  - name: ubuntu16-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu14-puppet6/Dockerfile.kitchen
-      disable_upstart: false
+      dockerfile: build/ubuntu16-puppet6/Dockerfile.kitchen
       run_command: /sbin/init
+      volume:
+        - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu14-puppet6/Puppetfile
-      # Due to issues with running apt-get during 'docker build' on Ubuntu 14,
-      # we need to install Puppet once the container has started.
-      # Good news, kitchen-puppet supports this with the following commands:
-      require_puppet_omnibus: true
-      require_puppet_collections: true
-      require_puppet_repo: false
-      puppet_omnibus_url: https://raw.githubusercontent.com/nmaludy/puppet-install-shell/master/install_puppet_6_agent.sh
+      puppetfile_path: build/ubuntu16-puppet6/Puppetfile
 
-  # Ubuntu Xenial with Systemd - Puppet 5
-  - name: ubuntu16-puppet5
+  # Ubuntu Bionic with Systemd - Puppet 5
+  - name: ubuntu18-puppet5
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet5/Dockerfile.kitchen
+      dockerfile: build/ubuntu18-puppet5/Dockerfile.kitchen
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
     provisioner:
-      puppetfile_path: build/ubuntu16-puppet5/Puppetfile
+      puppetfile_path: build/ubuntu18-puppet5/Puppetfile
 
-  # Ubuntu Xenial with Systemd - Puppet 6
-  - name: ubuntu16-puppet6
+  # Ubuntu Bionic with Systemd - Puppet 6
+  - name: ubuntu18-puppet6
     driver:
       platform: ubuntu
-      dockerfile: build/ubuntu16-puppet6/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-puppet6/Puppetfile
+      puppetfile_path: build/ubuntu18-puppet6/Puppetfile
 
 suites:
   - name: default

.travis.yml

@@ -84,26 +84,26 @@ matrix:
       gemfile: build/kitchen/Gemfile
       env:
         - TEST_NAME="centos7-puppet6"
-    - name: "Ubuntu 14 - Puppet 5"
+    - name: "Ubuntu 16 - Puppet 5"
       rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
-        - TEST_NAME="ubuntu14-puppet5"
-    - name: "Ubuntu 14 - Puppet 6"
+        - TEST_NAME="ubuntu16-puppet5"
+    - name: "Ubuntu 16 - Puppet 6"
       rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
-        - TEST_NAME="ubuntu14-puppet6"
-    - name: "Ubuntu 16 - Puppet 5"
+        - TEST_NAME="ubuntu16-puppet6"
+    - name: "Ubuntu 18 - Puppet 5"
       rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
-        - TEST_NAME="ubuntu16-puppet5"
-    - name: "Ubuntu 16 - Puppet 6"
+        - TEST_NAME="ubuntu18-puppet5"
+    - name: "Ubuntu 18 - Puppet 6"
       rvm: 2.5
       gemfile: build/kitchen/Gemfile
       env:
-        - TEST_NAME="ubuntu16-puppet6"
+        - TEST_NAME="ubuntu18-puppet6"
 
 notifications:
   # Post build failures to '#puppet' channel in 'stackstorm-community' Slack

CHANGELOG.md

@@ -15,6 +15,12 @@
 - Reorganized README.md to conform to the [Puppet module README template](https://puppet.com/docs/puppet/latest/modules_documentation.html#concept-3315)
   #283 (Enhancement)
   Contributed by @nmaludy
+  
+- Added support for Ubuntu 18.04 (Feature)
+  Contributed by @nmaludy
+
+- Dropped support for Ubuntu 14.04 (Enhancement)
+  Contributed by @nmaludy
 
 ## 1.5.0 (Oct 2, 2019)
 

README.md

@@ -71,11 +71,11 @@ and [librarian-puppet](http://librarian-puppet.com/).
  * RHEL/CentOS 6 - Puppet 6 - [build/centos6-puppet6/Puppetfile](build/centos6-puppet6/Puppetfile)
  * RHEL/CentOS 7 - Puppet 5 - [build/centos7-puppet5/Puppetfile](build/centos7-puppet5/Puppetfile)
  * RHEL/CentOS 7 - Puppet 6 - [build/centos7-puppet6/Puppetfile](build/centos7-puppet6/Puppetfile)
- * Ubuntu 14.04 - Puppet 5 - [build/ubuntu14-puppet5/Puppetfile](build/ubuntu14-puppet5/Puppetfile)
- * Ubuntu 14.04 - Puppet 6 - [build/ubuntu14-puppet6/Puppetfile](build/ubuntu14-puppet6/Puppetfile)
  * Ubuntu 16.04 - Puppet 5 - [build/ubuntu16-puppet5/Puppetfile](build/ubuntu16-puppet5/Puppetfile)
  * Ubuntu 16.04 - Puppet 6 - [build/ubuntu16-puppet6/Puppetfile](build/ubuntu16-puppet6/Puppetfile)
-
+ * Ubuntu 18.04 - Puppet 5 - [build/ubuntu18-puppet5/Puppetfile](build/ubuntu18-puppet5/Puppetfile)
+ * Ubuntu 18.04 - Puppet 6 - [build/ubuntu18-puppet6/Puppetfile](build/ubuntu18-puppet6/Puppetfile)
+ 
 ### Beginning with st2
 
 For a full installation on a single node, a profile already exists to
@@ -380,8 +380,8 @@ $res = run_task('st2::key_get', $stackstorm_target,
 
 ### Supported platforms
 
-* Ubuntu 14.04
 * Ubuntu 16.04
+* Ubuntu 18.04
 * RHEL/CentOS 6
 * RHEL/CentOS 7
 

Vagrantfile

@@ -24,11 +24,23 @@
 #   - Fix sudoers directory
 #       sudo su -
 #       chmod 440 -R /etc/sudoers.d
+#       chmod 755 -R /etc/sudoers.d # on ubuntu to get rsync to work
 #
 #   - Run puppet to install StackStorm
 #       puppet apply -e "include st2::profile::fullinstall"
 #
 #   - Keep editing files locally and re-running puppet with the command above
+#
+# Nick's notes
+# vagrant destroy -f
+# vagrant up
+# vagrant ssh
+# sudo su -
+# vi /etc/puppetlabs/code/modules/mongodb/manifests/repo.pp
+#           '4.2'   => 'E162F504A20CDF15827F718D4B7C549A058F8B6B',
+#           '4.0'   => '9DA31620334BD75D9DCB49F368818C72E52529D4',
+#
+# puppet apply -e "include st2::profile::fullinstall"
 
 # hostname of the VM
 hostname   = ENV['HOSTNAME'] ? ENV['HOSTNAME'] : 'puppet-st2-vagrant'
@@ -43,8 +55,8 @@ provider   = provider.to_sym
 #  - generic/ubuntu1404
 #  - generic/ubuntu1604
 #  - generic/ubuntu1804
-box        = ENV['BOX'] ? ENV['BOX'] : 'generic/centos8'
-#box        = ENV['BOX'] ? ENV['BOX'] : 'generic/ubuntu1604'
+#box        = ENV['BOX'] ? ENV['BOX'] : 'generic/centos8'
+box        = ENV['BOX'] ? ENV['BOX'] : 'generic/ubuntu1804'
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"

build/ubuntu18-puppet5/Dockerfile.kitchen

@@ -0,0 +1,37 @@
+# usage (from the root of the puppet-st2/ directory):
+# docker build -t stackstorm/puppet-st2-ubuntu18-puppet5 -f build/ubuntu18-puppet5/Dockerfile.kitchen .
+
+FROM stackstorm/packagingtest:bionic-systemd
+
+# kitchen setup
+RUN mkdir -p /var/run/sshd
+RUN useradd -d /home/<%= @username %> -m -s /bin/bash <%= @username %>
+RUN echo '<%= @username %> ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+RUN mkdir -p /home/<%= @username %>/.ssh
+RUN chown -R <%= @username %> /home/<%= @username %>/.ssh
+RUN chmod 0700 /home/<%= @username %>/.ssh
+RUN touch /home/<%= @username %>/.ssh/authorized_keys
+RUN chown <%= @username %> /home/<%= @username %>/.ssh/authorized_keys
+RUN chmod 0600 /home/<%= @username %>/.ssh/authorized_keys
+RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/authorized_keys
+
+# update OS
+RUN sudo apt-get -y update
+
+# install puppet
+# https://puppet.com/docs/puppet/5.5/puppet_platform.html#apt-based-systems
+RUN wget https://apt.puppetlabs.com/puppet5-release-bionic.deb
+RUN sudo dpkg -i puppet5-release-bionic.deb
+RUN sudo apt-get -y update
+RUN sudo apt-get -y install puppet-agent
+
+# put puppet in our path
+ENV PATH="/opt/puppetlabs/bin:${PATH}"
+RUN ln -s /opt/puppetlabs/bin/facter /usr/bin/
+RUN ln -s /opt/puppetlabs/bin/hiera /usr/bin/
+RUN ln -s /opt/puppetlabs/bin/mco /usr/bin/
+RUN ln -s /opt/puppetlabs/bin/puppet /usr/bin/
+
+# print versions (ruby 2.4.x, puppet 5.x)
+RUN puppet --version
+RUN sudo -E puppet --version

build/ubuntu18-puppet5/Puppetfile

@@ -0,0 +1,66 @@
+# coding: utf-8
+# ################
+# # Instructions #
+# ################
+# yum -y install puppet (or equivalent)
+# gem install r10k
+# # create a new file ./Puppetfile with the contents of this file
+# r10k puppetfile install -v --moduledir=./modules --puppetfile=./Puppetfile
+# # to check the module dependencies here:
+# # puppet module list --tree --modulepath ./modules/
+# puppet apply --modulepath=./modules -e "include st2::profile::fullinstall"
+#
+# #############
+# # DEV Notes #
+# #############
+# # To generate this file i did this, make sure you have this repo cloned:
+# pdk build
+# puppet module install ./pkg/stackstorm-st2-x.y.z.tar.gz
+# puppet module list --tree
+#
+# ######################
+# # Latest Module Tree #
+# ######################
+# └─┬ stackstorm-st2 (v1.4.0)
+#   ├── jamtur01-httpauth (v0.0.3)
+#   ├── puppetlabs-stdlib (v5.2.0)
+#   ├─┬ puppetlabs-apt (v6.3.0)
+#   │ └── puppetlabs-translate (v1.2.0)
+#   ├── puppet-wget (v2.0.1)
+#   ├── saz-sudo (v6.0.0)
+#   ├─┬ puppet-python (v2.2.2)
+#   │ └── stahnma-epel (v1.3.1)
+#   ├── puppetlabs-inifile (v2.5.0)
+#   ├── puppet-mongodb (v2.4.1)
+#   ├─┬ puppetlabs-postgresql (v5.12.1)
+#   │ └── puppetlabs-concat (v5.3.0)
+#   ├─┬ puppet-rabbitmq (v9.0.0)
+#   │ ├── puppet-archive (v3.2.1)
+#   │ └── camptocamp-systemd (v2.3.0)
+#   ├── ghoneycutt-facter (v3.5.0)
+#   ├── computology-packagecloud (v0.3.2)
+#   ├── puppet-selinux (v1.6.1)
+#   ├── puppet-nginx (v0.16.0)
+#   └── puppet-nodejs (v7.0.0)
+forge "https://forgeapi.puppetlabs.com"
+
+mod 'jamtur01-httpauth'
+mod 'puppetlabs-apt'
+mod 'stahnma-epel'
+mod 'puppetlabs-translate' # dependency of puppetlabs-apt
+mod 'puppet-wget'
+mod 'saz-sudo'
+mod 'puppet-python'
+mod 'puppet-mongodb'
+mod 'puppetlabs-postgresql'
+mod 'puppetlabs-concat'    # dependency of puppetlabs-postgresql
+mod 'puppet-rabbitmq'
+mod 'puppet-archive'       # dependency of puppet-rabbitmq
+mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
+mod 'ghoneycutt-facter'
+mod 'computology-packagecloud'
+mod 'puppet-selinux'
+mod 'puppet-nginx'
+mod 'puppet-nodejs'
+mod 'puppetlabs-inifile'
+mod 'puppetlabs-stdlib'

build/ubuntu18-puppet6/Dockerfile.kitchen

@@ -0,0 +1,37 @@
+# usage (from the root of the puppet-st2/ directory):
+# docker build -t stackstorm/puppet-st2-ubuntu18-puppet6 -f build/ubuntu18-puppet6/Dockerfile.kitchen .
+
+FROM stackstorm/packagingtest:bionic-systemd
+
+# kitchen setup
+RUN mkdir -p /var/run/sshd
+RUN useradd -d /home/<%= @username %> -m -s /bin/bash <%= @username %>
+RUN echo '<%= @username %> ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+RUN mkdir -p /home/<%= @username %>/.ssh
+RUN chown -R <%= @username %> /home/<%= @username %>/.ssh
+RUN chmod 0700 /home/<%= @username %>/.ssh
+RUN touch /home/<%= @username %>/.ssh/authorized_keys
+RUN chown <%= @username %> /home/<%= @username %>/.ssh/authorized_keys
+RUN chmod 0600 /home/<%= @username %>/.ssh/authorized_keys
+RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/authorized_keys
+
+# update OS
+RUN sudo apt-get -y update
+
+# install puppet
+# https://puppet.com/docs/puppet/6.0/puppet_platform.html
+RUN wget https://apt.puppetlabs.com/puppet6-release-bionic.deb
+RUN sudo dpkg -i puppet6-release-bionic.deb
+RUN sudo apt-get -y update
+RUN sudo apt-get -y install puppet-agent
+
+# put puppet in our path
+ENV PATH="/opt/puppetlabs/bin:${PATH}"
+RUN ln -s /opt/puppetlabs/bin/facter /usr/bin/
+RUN ln -s /opt/puppetlabs/bin/hiera /usr/bin/
+RUN ln -s /opt/puppetlabs/bin/mco /usr/bin/
+RUN ln -s /opt/puppetlabs/bin/puppet /usr/bin/
+
+# print versions (ruby 2.5.x, puppet 6.x)
+RUN puppet --version
+RUN sudo -E puppet --version

build/ubuntu18-puppet6/Puppetfile

@@ -0,0 +1,66 @@
+# coding: utf-8
+# ################
+# # Instructions #
+# ################
+# yum -y install puppet (or equivalent)
+# gem install r10k
+# # create a new file ./Puppetfile with the contents of this file
+# r10k puppetfile install -v --moduledir=./modules --puppetfile=./Puppetfile
+# # to check the module dependencies here:
+# # puppet module list --tree --modulepath ./modules/
+# puppet apply --modulepath=./modules -e "include st2::profile::fullinstall"
+#
+# #############
+# # DEV Notes #
+# #############
+# # To generate this file i did this, make sure you have this repo cloned:
+# pdk build
+# puppet module install ./pkg/stackstorm-st2-x.y.z.tar.gz
+# puppet module list --tree
+#
+# ######################
+# # Latest Module Tree #
+# ######################
+# └─┬ stackstorm-st2 (v1.4.0)
+#   ├── jamtur01-httpauth (v0.0.3)
+#   ├── puppetlabs-stdlib (v5.2.0)
+#   ├─┬ puppetlabs-apt (v6.3.0)
+#   │ └── puppetlabs-translate (v1.2.0)
+#   ├── puppet-wget (v2.0.1)
+#   ├── saz-sudo (v6.0.0)
+#   ├─┬ puppet-python (v2.2.2)
+#   │ └── stahnma-epel (v1.3.1)
+#   ├── puppetlabs-inifile (v2.5.0)
+#   ├── puppet-mongodb (v2.4.1)
+#   ├─┬ puppetlabs-postgresql (v5.12.1)
+#   │ └── puppetlabs-concat (v5.3.0)
+#   ├─┬ puppet-rabbitmq (v9.0.0)
+#   │ ├── puppet-archive (v3.2.1)
+#   │ └── camptocamp-systemd (v2.3.0)
+#   ├── ghoneycutt-facter (v3.5.0)
+#   ├── computology-packagecloud (v0.3.2)
+#   ├── puppet-selinux (v1.6.1)
+#   ├── puppet-nginx (v0.16.0)
+#   └── puppet-nodejs (v7.0.0)
+forge "https://forgeapi.puppetlabs.com"
+
+mod 'jamtur01-httpauth'
+mod 'puppetlabs-apt'
+mod 'stahnma-epel'
+mod 'puppetlabs-translate' # dependency of puppetlabs-apt
+mod 'puppet-wget'
+mod 'saz-sudo'
+mod 'puppet-python'
+mod 'puppet-mongodb'
+mod 'puppetlabs-postgresql'
+mod 'puppetlabs-concat'    # dependency of puppetlabs-postgresql
+mod 'puppet-rabbitmq'
+mod 'puppet-archive'       # dependency of puppet-rabbitmq
+mod 'camptocamp-systemd'   # dependency of puppet-rabbitmq
+mod 'ghoneycutt-facter'
+mod 'computology-packagecloud'
+mod 'puppet-selinux'
+mod 'puppet-nginx'
+mod 'puppet-nodejs'
+mod 'puppetlabs-inifile'
+mod 'puppetlabs-stdlib'