diff --git a/manifests/globals.pp b/manifests/globals.pp index 4d91b81213..72b0d52064 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -194,8 +194,6 @@ }, 'Debian' => $facts['os']['name'] ? { 'Debian' => $facts['os']['release']['major'] ? { - '8' => '9.4', - '9' => '9.6', '10' => '11', '11' => '13', default => undef, diff --git a/spec/defines/server/default_privileges_spec.rb b/spec/defines/server/default_privileges_spec.rb index 0c08cfdef4..933065f84f 100644 --- a/spec/defines/server/default_privileges_spec.rb +++ b/spec/defines/server/default_privileges_spec.rb @@ -112,8 +112,8 @@ it { is_expected.to compile.and_raise_error(%r{Illegal value for \$privilege parameter}) } end - context 'schemas on postgres < 10.0' do - include_examples 'Debian 9' + context 'schemas on postgres < 9.6' do + include_examples 'RedHat 7' let :params do { @@ -129,7 +129,7 @@ "class {'postgresql::server':}" end - it { is_expected.to compile.and_raise_error(%r{Default_privileges on schemas is only supported on PostgreSQL >= 10.0}m) } + it { is_expected.to compile.and_raise_error(%r{Default_privileges is only useable with PostgreSQL >= 9.6}m) } end context 'schemas on postgres >= 10.0' do diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb index 43da336db4..e7689b829a 100644 --- a/spec/spec_helper_local.rb +++ b/spec/spec_helper_local.rb @@ -122,10 +122,6 @@ def param(type, title, param) end end -shared_context 'Debian 9' do - let(:facts) { on_supported_os['debian-9-x86_64'] } -end - shared_context 'Debian 10' do let(:facts) { on_supported_os['debian-10-x86_64'] } end