Merge branch 'task-2494-config-replacement' into 'master'

Task 2494 config replacement

See merge request !87

public_html/deployment/classes/config-replacement.class.php

@@ -101,6 +101,10 @@ class configreplacement {
      */
     protected function _getForemanReplacement(){
         global $aConfig;
+        
+        $sProject = $this->_oProject->getId();
+        // echo "DEBUG: project id = $sProject<br>";
+        
         if (!$this->_sPhase){
             return false;
         }
@@ -111,12 +115,12 @@ class configreplacement {
         }
 
         // return already cached result
-        if (array_key_exists($this->_sPhase, $this->_aForemanReplacements)){
-            return $this->_aForemanReplacements[$this->_sPhase];
+        if (array_key_exists($sProject, $this->_aForemanReplacements)){
+            return $this->_aForemanReplacements[$sProject];
         }
         
         // rebuilt 
-        $this->_aForemanReplacements[$this->_sPhase]=false;
+        $this->_aForemanReplacements[$sProject]=false;
         $iEffectiveHostgroup=$this->getForemanHostgroup();
 
         // abort if no hostgroup was set
@@ -204,8 +208,12 @@ class configreplacement {
         $aYaml=spyc_load($sPart);
         // echo 'DEBUG: <pre>'.print_r($aYaml, 1).'</pre>';
 
+       
+        if (!isset($aYaml[$sProject])){
+            return false;
+        }
+        foreach ($aYaml as $sPrjId=>$aProject){
             $aReturn=array();
-        foreach ($aYaml as $aProject){
             foreach ($aProject as $sFile=>$aParams){
                 $aReturn[$sFile]=array();
                 if (array_key_exists('target', $aParams)){
@@ -222,9 +230,8 @@ class configreplacement {
                     }
                 }
             }
-        }
-
-        $this->_aForemanReplacements[$this->_sPhase]=array(
+            $this->_aForemanReplacements[$sPrjId]=array(
+                'phase'=>$this->_sPhase,
                 'rules'=>$aReturn,
                 'host'=>$sHost,
                 'yaml'=>$sPart,
@@ -232,7 +239,9 @@ class configreplacement {
                 'hostsall'=>$aHosts,
                 'hostsphase'=>$aHostsOfPhase,
             );
-        return $this->_aForemanReplacements[$this->_sPhase];
+        }
+
+        return $this->_aForemanReplacements[$sProject];
     }
 
     /**