Use $f_p::plugin::dynflow::external_core

Since 5bde9c7 there is a variable that explicitly sets the external core. Rather than copying the logic, this reuses the variable.
theforeman · Mar 15, 2020 · 8ebc4a2 · 8ebc4a2
1 parent 935d45a
commit 8ebc4a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/manifests/plugin/ansible.pp b/manifests/plugin/ansible.pp
@@ -73,7 +73,7 @@
     template_path => 'foreman_proxy/plugin/ansible.yml.erb',
   }
 
-  if $::osfamily == 'RedHat' and $::operatingsystem != 'Fedora' {
+  if $foreman_proxy::plugin::dynflow::external_core {
     Foreman_proxy::Settings_file['ansible'] ~> Service['smart_proxy_dynflow_core']
   }
 }
diff --git a/manifests/plugin/dynflow.pp b/manifests/plugin/dynflow.pp
@@ -52,8 +52,7 @@
     template_path => 'foreman_proxy/plugin/dynflow.yml.erb',
   }
 
-  if $facts['osfamily'] == 'RedHat' {
-
+  if $external_core {
     foreman_proxy::plugin { 'dynflow_core':
     }
     ~> file { '/etc/smart_proxy_dynflow_core/settings.yml':

diff --git a/manifests/plugin/remote_execution/ssh.pp b/manifests/plugin/remote_execution/ssh.pp
@@ -102,7 +102,7 @@
     }
   }
 
-  if $::osfamily == 'RedHat' and $::operatingsystem != 'Fedora' {
+  if $foreman_proxy::plugin::dynflow::external_core {
     if $ssh_kerberos_auth {
       Package[$kerberos_pkg] ~> Service['smart_proxy_dynflow_core']
     }