diff --git a/manifests/params.pp b/manifests/params.pp index 6169c7f..67f300b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -94,7 +94,7 @@ class puppet_cd::params ( String $pt_agent_pkg = 'puppet-agent', String $pt_server_pkg = 'puppetserver', Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], - Array $pt_r10k_pkg = ['ruby','ruby-devel'], + Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'], # user settings ## puppet user diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index efab7e6..48c8f28 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -8,24 +8,24 @@ class puppet_cd::r10k::install ( ) inherits puppet_cd::params { # if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { if $pt_use_r10k == true { - # install required packages - package { $pt_r10k_pkg: - ensure => $pt_pkg_ensure, - before => Exec['enable_crb'], - } - - # enable CRB and install development_tools + # enable CRB exec { 'enable_crb': command => 'dnf config-manager --set-enabled crb', unless => 'dnf repolist --disabled | grep -qE "crb|CodeReady"', - path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'], + path => ['/usr/bin', '/bin'], + } + + # install required packages + package { $pt_r10k_pkg: + ensure => $pt_pkg_ensure, + before => Package['r10k'], + require => Exec['enable_crb'], } # install r10k via gem package { 'r10k': ensure => $pt_pkg_ensure, provider => gem, - require Exec['enable_crb'], } # configure r10k.yaml