Skip to content

Commit 99b08eb

Browse files
committed
BREAKING: Remove support for Debian 9 and Ubuntu 16.04
- Deprecate Debian 9 and Ubuntu 16.04 - Add support for Debian 10 - Remove RABBITMQ_USE_LONGNAME in clustering acceptance tests Acceptance tests fail on instance without a FQDN when `RABBITMQ_USE_LONGNAME` is set to `true` in the environment. Simplify the test case; this still seems to work on older and newer supported versions Signed-off-by: William Yardley <wyardley@users.noreply.github.com>
1 parent 5f1b211 commit 99b08eb

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

metadata.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
{
2424
"operatingsystem": "Debian",
2525
"operatingsystemrelease": [
26-
"9"
26+
"10"
2727
]
2828
},
2929
{
3030
"operatingsystem": "Ubuntu",
3131
"operatingsystemrelease": [
32-
"16.04",
3332
"18.04"
3433
]
3534
},

spec/acceptance/clustering_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class { 'rabbitmq':
1111
config_cluster => true,
1212
cluster_nodes => ['rabbit1', 'rabbit2'],
1313
cluster_node_type => 'ram',
14-
environment_variables => { 'RABBITMQ_USE_LONGNAME' => true },
1514
erlang_cookie => 'TESTCOOKIE',
1615
wipe_db_on_cookie_change => false,
1716
}
@@ -37,7 +36,6 @@ class { 'rabbitmq':
3736
config_cluster => true,
3837
cluster_nodes => ['rabbit1', 'rabbit2'],
3938
cluster_node_type => 'ram',
40-
environment_variables => { 'RABBITMQ_USE_LONGNAME' => true },
4139
erlang_cookie => 'TESTCOOKIE',
4240
wipe_db_on_cookie_change => true,
4341
}
@@ -83,7 +81,7 @@ class { 'rabbitmq':
8381
config_cluster => true,
8482
cluster_nodes => ['foobar', 'rabbit2'],
8583
cluster_node_type => 'ram',
86-
environment_variables => { 'RABBITMQ_USE_LONGNAME' => true, 'NODENAME' => 'rabbit@foobar' },
84+
environment_variables => { 'NODENAME' => 'rabbit@foobar' },
8785
erlang_cookie => 'TESTCOOKIE',
8886
}
8987
if $facts['os']['family'] == 'RedHat' {

0 commit comments

Comments
 (0)