Skip to content

Commit 6a11a41

Browse files
authored
Merge pull request #269 from gnewson/master
Support for Ubuntu 18.04
2 parents 5dbabb9 + c37098d commit 6a11a41

File tree

16 files changed

+38
-7
lines changed

16 files changed

+38
-7
lines changed

.kitchen.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ platforms:
3131
run_command: /sbin/init
3232
volume:
3333
- /sys/fs/cgroup:/sys/fs/cgroup:ro
34+
# Ubuntu Bionic with Systemd
35+
- name: ubuntu-18.04
36+
driver_config:
37+
image: stackstorm/packagingtest:bionic-systemd
38+
platform: ubuntu
39+
run_command: /sbin/init
40+
volume:
41+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3442
# CentOS7 with Systemd
3543
- name: centos-7
3644
driver_config:

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ branches:
1010
env:
1111
# default is stable repo
1212
- DISTRO=ubuntu-16 LICENSE='BWC_LICENSE_ENTERPRISE'
13+
- DISTRO=ubuntu-18 LICENSE='BWC_LICENSE_ENTERPRISE'
1314
- DISTRO=centos-7 LICENSE='BWC_LICENSE_ENTERPRISE'
1415
- DISTRO=centos-8 LICENSE='BWC_LICENSE_ENTERPRISE'
1516

1617
# StackStorm 'unstable' repo check
1718
- DISTRO=ubuntu-16 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
19+
- DISTRO=ubuntu-18 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
1820
- DISTRO=centos-7 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
1921
- DISTRO=centos-8 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
2022

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ Aka IFTTT orchestration for Ops.
1010

1111
## Supported platforms
1212
* Ubuntu Xenial (16.04)
13+
* Ubuntu Bionic (18.04)
1314
* RHEL7 / CentOS7
1415
* RHEL8 / CentOS8
1516

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

101102
These are the platforms we must support (must pass end-to-end testing):
102-
- Xenial
103+
- Ubuntu Xenial
104+
- Ubuntu Bionic
103105
- CentOS7
104106
- CentOS8
105107
- RHEL7 (via AWS)
106108
- RHEL8 (via AWS)
107109

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

110-
For development purposes there is [Vagrantfile](Vagrantfile) available. The following command will setup ubuntu16 box (`ubuntu/xenial64`) by default:
112+
For development purposes there is [Vagrantfile](Vagrantfile) available. The following command will setup ubuntu18 box (`ubuntu/bionic64`) by default:
111113
```sh
112114
vagrant up
113115
```
114116

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

127130
* Manual Instructions
128-
* [Ubuntu 16.04](https://docs.stackstorm.com/install/deb.html)
131+
* [Ubuntu 16.04](https://docs.stackstorm.com/install/u16.html)
132+
* [Ubuntu 18.04](https://docs.stackstorm.com/install/u18.html)
129133
* [RHEL8/CentOS8](https://docs.stackstorm.com/install/rhel8.html)
130134
* [RHEL7/CentOS7](https://docs.stackstorm.com/install/rhel7.html)
131135

Vagrantfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ VIRTUAL_MACHINES = {
66
:hostname => 'ansible-st2-ubuntu16',
77
:box => 'ubuntu/xenial64',
88
},
9+
:ubuntu18 => {
10+
:hostname => 'ansible-st2-ubuntu18',
11+
:box => 'ubuntu/bionic64',
12+
},
913
:centos7 => {
1014
:hostname => 'ansible-st2-centos7',
1115
:box => 'centos/7',
@@ -23,7 +27,7 @@ Vagrant.configure(2) do |config|
2327
config.ssh.forward_agent = true
2428

2529
VIRTUAL_MACHINES.each do |name, cfg|
26-
config.vm.define name, autostart: (name == :ubuntu16) do |vm_config|
30+
config.vm.define name, autostart: (name == :ubuntu18) do |vm_config|
2731
vm_config.vm.hostname = cfg[:hostname]
2832
vm_config.vm.box = cfg[:box]
2933

meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ galaxy_info:
1616
platforms:
1717
- name: Ubuntu
1818
versions:
19+
- bionic
1920
- xenial
2021
- name: EL
2122
versions:

roles/StackStorm.ewc/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.ewc_smoketests/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.mongodb/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.nginx/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ galaxy_info:
99
platforms:
1010
- name: Ubuntu
1111
versions:
12+
- bionic
1213
- xenial
1314
- name: EL
1415
versions:

roles/StackStorm.nodejs/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ galaxy_info:
99
platforms:
1010
- name: Ubuntu
1111
versions:
12+
- bionic
1213
- xenial
1314
- name: EL
1415
versions:

roles/StackStorm.rabbitmq/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.st2/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.st2chatops/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.st2repo/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ galaxy_info:
88
platforms:
99
- name: Ubuntu
1010
versions:
11+
- bionic
1112
- xenial
1213
- name: EL
1314
versions:

roles/StackStorm.st2web/meta/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ galaxy_info:
99
platforms:
1010
- name: Ubuntu
1111
versions:
12+
- bionic
1213
- xenial
1314
- name: EL
1415
versions:

stackstorm.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
- StackStorm.mongodb
77
- StackStorm.rabbitmq
88
- role: StackStorm.postgresql
9-
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8')
9+
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') and
10+
not (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '18')
1011
- StackStorm.st2repo
1112
- StackStorm.st2
1213
- role: StackStorm.st2mistral
13-
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8')
14+
when: not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') and
15+
not (ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_major_version == '18')
1416
- StackStorm.nginx
1517
- StackStorm.st2web
1618
- StackStorm.nodejs

0 commit comments

Comments
 (0)