WIP

theforeman · Oct 10, 2020 · b0ca7f7 · b0ca7f7
1 parent 5fbc7c8
commit b0ca7f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/manifests/apache.pp b/manifests/apache.pp
@@ -62,6 +62,4 @@
       path        => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     }
   }
-
-  Class['apache::service'] -> Class['foreman::apache']
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -336,18 +336,23 @@
   include foreman::install
   include foreman::config
   include foreman::database
-  contain foreman::service
+  include foreman::service
+
+  anchor { 'foreman::running': # lint:ignore:anchor_resource
+  }
 
   Anchor <| title == 'foreman::repo' |> ~> Class['foreman::install']
   Class['foreman::install'] ~> Class['foreman::config', 'foreman::service']
   Class['foreman::config'] ~> Class['foreman::database', 'foreman::service']
   Class['foreman::database'] ~> Class['foreman::service']
-  Class['foreman::service'] -> Foreman_smartproxy <| base_url == $foreman_url |>
+  Class['foreman::service'] -> Anchor['foreman::running']
+  Anchor['foreman::running'] -> Foreman_smartproxy <| base_url == $foreman_url |>
 
   if $apache {
-    contain foreman::apache
+    include foreman::apache
 
     Class['foreman::config', 'foreman::database'] -> Class['foreman::apache']
+    Class['foreman::apache', 'apache::service'] -> Class['foreman::running']
     if $ipa_authentication and $keycloak {
       fail("${facts['networking']['hostname']}: External authentication via IPA and Keycloak are mutually exclusive.")
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,4 @@ @@
           path        => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
         }
       }
-      Class['apache::service'] -> Class['foreman::apache']
     }