Update metadata to support el8 instead of el7 again

This patch again updates metadata to support el8 instead of el7, which
was initially merged[1] but reverted because of failures in unit tests
caused by old puppet modules installed as dependencies.

This patch removes version cap for puppet-etcd and puppet-redis, so
that we can use their lastet verions compatible with el8.

[1] ff22e7c268

Related-Bug: #1872562
Change-Id: I3924d35fae48accb57186c1c5c0a3192bacccda6
This commit is contained in:
Takashi Kajinami 2020-04-14 23:23:55 +09:00
parent e240091435
commit 1ca336329b
2 changed files with 6 additions and 8 deletions

View File

@ -26,8 +26,8 @@ mod 'datacat',
:ref => '0.6.2'
mod 'etcd',
:git => 'https://github.com/cristifalcas/puppet-etcd',
:ref => '1.11.0'
:git => 'https://github.com/puppet-etcd/puppet-etcd',
:ref => 'master'
mod 'fdio',
:git => 'https://git.fd.io/puppet-fdio',
@ -85,11 +85,9 @@ mod 'keepalived',
:git => 'https://github.com/Unyonsys/puppet-module-keepalived',
:ref => 'bbca37ade629a9178f09366fd0368187fb645f4e'
# NOTE(aschultz) this redis module was dropped from p-o-i due to issues for
# bionic, so we'll just keep it here for now. LP#1784422
mod 'redis',
:git => 'https://github.com/arioch/puppet-redis',
:ref => 'v3.3.0'
:git => 'https://github.com/voxpupuli/puppet-redis',
:ref => 'master'
# NOTE(aschultz): in puppet 6 this was extracted out
mod 'selinux_core',

View File

@ -14,11 +14,11 @@
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
"operatingsystemrelease": ["7"]
"operatingsystemrelease": ["8"]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": ["7"]
"operatingsystemrelease": ["8"]
}
],
"dependencies": [