diff --git a/.vscode/settings.json b/.vscode/settings.json index f77f368..e842291 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,6 +17,7 @@ "pydantic", "pylint", "pytest", + "repolist", "requestlogging", "springframework", "startswith", diff --git a/doc/_index.html b/doc/_index.html index c6d58a4..32a917b 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,11 +123,6 @@ -
  • - puppet_cd::r10k::install - -
    • -
  • puppet_cd::r10k::webhook diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index a1f97c5..42e1315 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -113,21 +113,14 @@
    • -
  • -
    - puppet_cd::r10k::install -
    -
    • - - -
  • +
  • puppet_cd::r10k::webhook
    • -
  • +
  • puppet_cd::server::service
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 19a3b91..29163d4 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -77,8 +77,6 @@ puppet_cd::main::install
    - puppet_cd::r10k::install
    - puppet_cd::r10k::webhook
    puppet_cd::puppetdb::dirs
    diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index 9d0a659..efab7e6 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -11,13 +11,21 @@ class puppet_cd::r10k::install ( # install required packages package { $pt_r10k_pkg: ensure => $pt_pkg_ensure, - before => Package['r10k'], + before => Exec['enable_crb'], + } + + # enable CRB and install development_tools + 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'], } # install r10k via gem package { 'r10k': ensure => $pt_pkg_ensure, provider => gem, + require Exec['enable_crb'], } # configure r10k.yaml