Skip to content

Commit

Permalink
Merge pull request #269 from gnewson/master
Browse files Browse the repository at this point in the history
Support for Ubuntu 18.04
  • Loading branch information
arm4b authored Jul 27, 2020
2 parents 5dbabb9 + c37098d commit 6a11a41
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 7 deletions.
8 changes: 8 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ platforms:
run_command: /sbin/init
volume:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
# Ubuntu Bionic with Systemd
- name: ubuntu-18.04
driver_config:
image: stackstorm/packagingtest:bionic-systemd
platform: ubuntu
run_command: /sbin/init
volume:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
# CentOS7 with Systemd
- name: centos-7
driver_config:
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ branches:
env:
# default is stable repo
- DISTRO=ubuntu-16 LICENSE='BWC_LICENSE_ENTERPRISE'
- DISTRO=ubuntu-18 LICENSE='BWC_LICENSE_ENTERPRISE'
- DISTRO=centos-7 LICENSE='BWC_LICENSE_ENTERPRISE'
- DISTRO=centos-8 LICENSE='BWC_LICENSE_ENTERPRISE'

# StackStorm 'unstable' repo check
- DISTRO=ubuntu-16 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
- DISTRO=ubuntu-18 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
- DISTRO=centos-7 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
- DISTRO=centos-8 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'

Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ Aka IFTTT orchestration for Ops.

## Supported platforms
* Ubuntu Xenial (16.04)
* Ubuntu Bionic (18.04)
* RHEL7 / CentOS7
* RHEL8 / CentOS8

> If you're using the provided Vagrantfile, note that it uses Xenial by default.
> If you're using the provided Vagrantfile, note that it uses Bionic by default.
> In order to access StackStorm Web UI, please don't forget to ensure that http/https ports are opened in your firewall system.
Expand Down Expand Up @@ -99,21 +100,23 @@ st2smoketests, you will need to disable proxy for localhost.
There are a few requirements when developing on `ansible-st2`.

These are the platforms we must support (must pass end-to-end testing):
- Xenial
- Ubuntu Xenial
- Ubuntu Bionic
- CentOS7
- CentOS8
- RHEL7 (via AWS)
- RHEL8 (via AWS)

Must also support Ansible Idempotence (Eg. Ansible-playbook re-run should end with the following results: `changed=0.*failed=0`)

For development purposes there is [Vagrantfile](Vagrantfile) available. The following command will setup ubuntu16 box (`ubuntu/xenial64`) by default:
For development purposes there is [Vagrantfile](Vagrantfile) available. The following command will setup ubuntu18 box (`ubuntu/bionic64`) by default:
```sh
vagrant up
```

Other distros:
```sh
vagrant up ubuntu16
vagrant up centos7
vagrant up centos8
```
Expand All @@ -125,7 +128,8 @@ You might be interested in other methods to deploy StackStorm engine:
* [Puppet Module](https://github.com/stackstorm/puppet-st2)

* Manual Instructions
* [Ubuntu 16.04](https://docs.stackstorm.com/install/deb.html)
* [Ubuntu 16.04](https://docs.stackstorm.com/install/u16.html)
* [Ubuntu 18.04](https://docs.stackstorm.com/install/u18.html)
* [RHEL8/CentOS8](https://docs.stackstorm.com/install/rhel8.html)
* [RHEL7/CentOS7](https://docs.stackstorm.com/install/rhel7.html)

Expand Down
6 changes: 5 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ VIRTUAL_MACHINES = {
:hostname => 'ansible-st2-ubuntu16',
:box => 'ubuntu/xenial64',
},
:ubuntu18 => {
:hostname => 'ansible-st2-ubuntu18',
:box => 'ubuntu/bionic64',
},
:centos7 => {
:hostname => 'ansible-st2-centos7',
:box => 'centos/7',
Expand All @@ -23,7 +27,7 @@ Vagrant.configure(2) do |config|
config.ssh.forward_agent = true

VIRTUAL_MACHINES.each do |name, cfg|
config.vm.define name, autostart: (name == :ubuntu16) do |vm_config|
config.vm.define name, autostart: (name == :ubuntu18) do |vm_config|
vm_config.vm.hostname = cfg[:hostname]
vm_config.vm.box = cfg[:box]

Expand Down
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.ewc/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.ewc_smoketests/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.mongodb/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.nginx/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.nodejs/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.rabbitmq/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2chatops/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2repo/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
1 change: 1 addition & 0 deletions roles/StackStorm.st2web/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- bionic
- xenial
- name: EL
versions:
Expand Down
6 changes: 4 additions & 2 deletions stackstorm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
- StackStorm.mongodb
- StackStorm.rabbitmq
- role: StackStorm.postgresql
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8')
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') and
not (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '18')
- StackStorm.st2repo
- StackStorm.st2
- role: StackStorm.st2mistral
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8')
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') and
not (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '18')
- StackStorm.nginx
- StackStorm.st2web
- StackStorm.nodejs
Expand Down

0 comments on commit 6a11a41

Please sign in to comment.