tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaHostGroup(Legacy): Fix member rendering with correct attribute

Browse Source 
refs #13049
This commit is contained in:
Markus Frosch 2016-11-14 15:36:55 +01:00
parent 5ee911ef7c
commit b40cfd5f05
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Director/Objects/IcingaHostGroup.php
View File

@ -53,7 +53,7 @@ class IcingaHostGroup extends IcingaObjectGroup
if (empty($zoneMap)) { if (empty($zoneMap)) {
// no hosts matched // no hosts matched
$file = $this->legacyZoneHostgroupFile($config); $file = $this->legacyZoneHostgroupFile($config);
$this->properties['hostgroup_members'] = array(); $this->properties['members'] = array();
$file->addLegacyObject($this); $file->addLegacyObject($this);
} else { } else {
@ -61,7 +61,7 @@ class IcingaHostGroup extends IcingaObjectGroup
foreach ($zoneMap as $zoneId => $members) { foreach ($zoneMap as $zoneId => $members) {
$file = $this->legacyZoneHostgroupFile($config, $zoneId); $file = $this->legacyZoneHostgroupFile($config, $zoneId);
$this->properties['hostgroup_members'] = $members; $this->properties['members'] = $members;
$file->addLegacyObject($this); $file->addLegacyObject($this);
$allMembers = array_merge($allMembers, $members); $allMembers = array_merge($allMembers, $members);
@ -69,7 +69,7 @@ class IcingaHostGroup extends IcingaObjectGroup
$deploymentMode = $config->getDeploymentMode(); $deploymentMode = $config->getDeploymentMode();
if ($deploymentMode === 'active-passive') { if ($deploymentMode === 'active-passive') {
$this->properties['hostgroup_members'] = $allMembers; $this->properties['members'] = $allMembers;
$this->legacyZoneHostgroupFile($config, 0) $this->legacyZoneHostgroupFile($config, 0)
->addLegacyObject($this); ->addLegacyObject($this);
} else if ($deploymentMode == 'masterless') { } else if ($deploymentMode == 'masterless') {
@ -92,16 +92,16 @@ class IcingaHostGroup extends IcingaObjectGroup
); );
} }
protected function renderLegacyHostgroup_members() protected function renderLegacyMembers()
{ {
if (empty($this->properties['hostgroup_members'])) { if (empty($this->properties['members'])) {
return ''; return '';
} }
return c1::renderKeyValue('hostgroup_members', join(',', $this->properties['hostgroup_members'])); return c1::renderKeyValue('members', join(',', $this->properties['members']));
} }
/** /**
* Note: rendered with renderLegacyHostgroup_members() * Note: rendered with renderLegacyMembers()
* *
* @return string * @return string
*/ */