openstack
/
puppet-tripleo
Code Issues Proposed changes

Resolve conflict during module installation for unit tests 

Since the change[1] in p-o-i is merged, selinux_core is automatically
installed during unit test and inistallation of modules fails if we
have the same module included in Puppet_extras file.

This patch removes selinux_core from Puppet_extras because for
the current CI jobs of puppet-tripleo it's enough if the package is
somehow installed during unit tests.

[1] ef3c5dc9b7294b38b95c4e900bd142987472f976

Closes-Bug: #1894984
Change-Id: I15e541a641969af7ac117faf13d67827662e7ca6
This commit is contained in:
Takashi Kajinami 2020-09-09 20:34:53 +09:00
parent b784dc7aa6
commit 39a33dad4d
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Puppetfile_extras
View File

@ -78,8 +78,3 @@ mod 'keepalived',
mod 'redis',
:git => 'https://github.com/voxpupuli/puppet-redis',
:ref => 'master'
# NOTE(aschultz): in puppet 6 this was extracted out
mod 'selinux_core',
:git => 'https://github.com/puppetlabs/puppetlabs-selinux_core',
:ref => 'main'