Skip to content
Snippets Groups Projects
Commit 6396c4ec authored by hahn's avatar hahn
Browse files

- FIX: include config for cronjob cron_deployment

- FIX: progress message in method Deploy
parent 3a8210bd
No related branches found
No related tags found
No related merge requests found
...@@ -1335,6 +1335,9 @@ class project { ...@@ -1335,6 +1335,9 @@ class project {
$sQueueLink = $this->_getFileBase($sPhase, "onhold"); $sQueueLink = $this->_getFileBase($sPhase, "onhold");
$sRepoLink = $this->_getFileBase($sPhase, "ready2install"); $sRepoLink = $this->_getFileBase($sPhase, "ready2install");
// --------------------------------------------------
// checks
// --------------------------------------------------
$sReturn.="<h3>" . t("class-project-deploy-label-checks") . "</h3>"; $sReturn.="<h3>" . t("class-project-deploy-label-checks") . "</h3>";
if (array_key_exists("deploytimes", $this->_aConfig["phases"][$sPhase])) { if (array_key_exists("deploytimes", $this->_aConfig["phases"][$sPhase])) {
// check if the a deploy time is reached // check if the a deploy time is reached
...@@ -1392,8 +1395,14 @@ class project { ...@@ -1392,8 +1395,14 @@ class project {
$this->_TempDelete(); $this->_TempDelete();
return $this->getBox("error", t("class-project-error-command-failed") . $sReturn); return $this->getBox("error", t("class-project-error-command-failed") . $sReturn);
} }
$this->_TempFill($sReturn);
$aActionList['iActive'] ++;
$this->_TempFill($sReturn, $aActionList);
// --------------------------------------------------
// synch packages
// --------------------------------------------------
// $sReturn.=$this->_execAndSend("ln -s $sLinkTarget $sLinkName"); // $sReturn.=$this->_execAndSend("ln -s $sLinkTarget $sLinkName");
if (array_key_exists('mirrorPackages', $this->_aConfig) && count($this->_aConfig['mirrorPackages'])) { if (array_key_exists('mirrorPackages', $this->_aConfig) && count($this->_aConfig['mirrorPackages'])) {
foreach ($this->_aConfig['mirrorPackages'] as $sLabel => $aTarget) { foreach ($this->_aConfig['mirrorPackages'] as $sLabel => $aTarget) {
...@@ -1427,6 +1436,11 @@ class project { ...@@ -1427,6 +1436,11 @@ class project {
$aActionList['iActive'] ++; $aActionList['iActive'] ++;
$this->_TempFill($sReturn, $aActionList); $this->_TempFill($sReturn, $aActionList);
// --------------------------------------------------
// move the queue link to the repo name
// --------------------------------------------------
// TODO: run puppet agent on target server(s) - for preview only // TODO: run puppet agent on target server(s) - for preview only
if (array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) && $this->_aPrjConfig["phases"][$sPhase]["puppethost"] if (array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) && $this->_aPrjConfig["phases"][$sPhase]["puppethost"]
) { ) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment