search

Katello / katello-client-bootstrap

Bootstrap Script for migrating systems to Foreman & Katello
GNU General Public License v2.0
52 stars 63 forks source link

Make bootstrap.py compatible with Puppet 4 #230

Closed h4xr closed 6 years ago

h4xr commented 6 years ago

Fixes #229

Signed-off-by: Saurabh Badhwar sbadhwar@redhat.com

h4xr commented 6 years ago

@evgeni Addressed the changes in the commit. Please review :)

evgeni commented 6 years ago

code LGTM :+1:

I'll give it a few test runs later today and merge afterwards, unless @sideangleside is faster ;)

evgeni commented 6 years ago

So I gave it a fair spin, and it seems to work fine. However I spotted a few differences in the puppet.conf compared to the version Foreman deploys by default:

our:

vardir = /var/lib/puppet
logdir = /var/log/puppet
rundir = /var/run/puppet
ssldir = $vardir/ssl

foreman:

vardir = /opt/puppetlabs/puppet/cache
logdir = /var/log/puppetlabs/puppet
rundir = /var/run/puppetlabs
ssldir = /etc/puppetlabs/puppet/ssl

I think we should align this for the Puppet4/5 case.

evgeni commented 6 years ago

and with that change, we should also extend https://github.com/h4xr/katello-client-bootstrap/blob/2a9f0662d26b90042141a79cda9d216eb3118079/bootstrap.py#L384 to wipe /opt/puppetlabs/puppet/cache and /etc/puppetlabs/puppet/ssl

sideangleside commented 6 years ago

LGTM 👍

sideangleside commented 6 years ago

Thanks for the PR @h4xr