Do not enable Puppet if there is no Pulp 2

theforeman · Oct 22, 2020 · c84c03b · c84c03b
1 parent 077016b
commit c84c03b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/manifests/application.pp b/manifests/application.pp
@@ -50,7 +50,7 @@
  $enable_ostree = $katello::params::enable_ostree
  $enable_yum = $katello::params::enable_yum
  $enable_file = $katello::params::enable_file
- $enable_puppet = $katello::params::enable_puppet
+ $enable_puppet = $katello::params::_enable_puppet
  $enable_docker = $katello::params::enable_docker
  $enable_deb = $katello::params::enable_deb
  $pulp_url = $katello::params::pulp_url

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -39,4 +39,5 @@
  String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package,
  Boolean $pulp2_support = $katello::globals::pulp2_support,
 ) inherits katello::globals {
+ $_enable_puppet = $pulp2_support and $enable_puppet
 }
diff --git a/manifests/pulp.pp b/manifests/pulp.pp
@@ -146,7 +146,7 @@
  enable_rpm => $katello::params::enable_yum,
  enable_iso => $katello::params::enable_file,
  enable_deb => $katello::params::enable_deb,
- enable_puppet => $katello::params::enable_puppet,
+ enable_puppet => $katello::params::_enable_puppet,
  enable_docker => $katello::params::enable_docker,
  enable_ostree => $katello::params::enable_ostree,
  num_workers => $num_workers,

diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
@@ -101,7 +101,7 @@ class { 'katello::params':
  ' :yum: true',
  ' :file: true',
  ' :deb: true',
- ' :puppet: true',
+ ' :puppet: false',
  ' :docker: true',
  ' :ostree: false',
  ' :candlepin:',
@@ -194,7 +194,7 @@ class { 'katello::params':
  ' :yum: true',
  ' :file: true',
  ' :deb: true',
- ' :puppet: true',
+ ' :puppet: false',
  ' :docker: true',
  ' :ostree: false',
  ' :candlepin:',
@@ -269,7 +269,7 @@ class {'katello::globals':
  ' :yum: true',
  ' :file: true',
  ' :deb: true',
- ' :puppet: true',
+ ' :puppet: false',
  ' :docker: true',
  ' :ostree: true',
  ' :candlepin:',