Stop installing puppet with puppet

Currently, the openstack_project::server class unconditionally ensures
the 'puppet' package is installed. As long as we're using puppet 3, this
is a noop: if puppet is running, then it's already installled. However,
if we have installed puppet 4 from the puppetlabs repositories, then the
puppet 4 package is actually called 'puppet-agent', and reinstalling the
'puppet' package from the distro repositories will clobber it. We could
work around this in two ways: one is to add logic to the
openstack_project::server class to manage the correct package name and
correct package version based on a parameter or the current state of the
system, and the other is to stop managing it entirely from puppet. Since
we're already managing it from ansible, let's go with the
less-puppet-code option.

This change also lets us make the puppet-4 system-config-specific beaker
jobs voting.

Change-Id: I32c02302a5009dcd3a54fae7fb346f2214be886a
This commit is contained in:
Colleen Murphy 2018-07-11 08:46:57 +02:00
parent b21cf38fab
commit 79e04fedd7
2 changed files with 4 additions and 5 deletions

View File

@ -27,11 +27,11 @@
jobs:
- puppet-beaker-rspec-infra-system-config
- puppet-beaker-rspec-infra-centos-7-system-config
- puppet-beaker-rspec-puppet-4-infra-system-config:
voting: false
- puppet-beaker-rspec-puppet-4-centos-7-infra-system-config:
voting: false
- puppet-beaker-rspec-puppet-4-infra-system-config
- puppet-beaker-rspec-puppet-4-centos-7-infra-system-config
gate:
jobs:
- puppet-beaker-rspec-infra-system-config
- puppet-beaker-rspec-infra-centos-7-system-config
- puppet-beaker-rspec-puppet-4-infra-system-config
- puppet-beaker-rspec-puppet-4-centos-7-infra-system-config

View File

@ -8,7 +8,6 @@ class openstack_project::params {
'git',
'lvm2',
'parted',
'puppet',
'rsync',
'strace',
'tcpdump',