tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kickstart: deal with multiple DBs

This commit is contained in:
Thomas Gelf 2018-10-08 06:18:32 +02:00
parent 8cec78a7c3
commit fa70ecde0e
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/controllers/IndexController.php
View File

@ -22,7 +22,6 @@ class IndexController extends DashboardController
}
} else {
$this->showKickstartForm();
return;
}
if ($migrations->hasPendingMigrations()) {
@ -45,7 +44,11 @@ class IndexController extends DashboardController
$this->addSingleTab($this->translate('Kickstart'));
}
$this->content()->prepend(KickstartForm::load()->handleRequest());
$form = KickstartForm::load();
if ($name = $this->getPreferredDbResourceName()) {
$form->setDbResourceName($name);
}
$this->content()->prepend($form->handleRequest());
}
protected function hasDeploymentEndpoint()

32
application/forms/KickstartForm.php
View File

@ -26,8 +26,9 @@ class KickstartForm extends DirectorForm
/** @var IcingaEndpoint */
private $endpoint;
private $dbResourceName;
/**
* @throws \Icinga\Exception\IcingaException
* @throws \Zend_Form_Exception
*/
public function setup()
@ -36,12 +37,14 @@ class KickstartForm extends DirectorForm
$this->createDbLabel = $this->translate('Create database schema');
$this->migrateDbLabel = $this->translate('Apply schema migrations');
$this->addResourceConfigElements();
$this->addResourceDisplayGroup();
if ($this->dbResourceName === null) {
$this->addResourceConfigElements();
$this->addResourceDisplayGroup();
if (!$this->config()->get('db', 'resource')
|| ($this->config()->get('db', 'resource') !== $this->getResourceName())) {
return;
if (!$this->config()->get('db', 'resource')
|| ($this->config()->get('db', 'resource') !== $this->getResourceName())) {
return;
}
}
if (!$this->migrations()->hasSchema()) {
@ -266,6 +269,10 @@ class KickstartForm extends DirectorForm
*/
protected function addResourceDisplayGroup()
{
if ($this->dbResourceName !== null) {
return;
}
$elements = array(
'HINT_no_resource',
'resource',
@ -353,7 +360,6 @@ class KickstartForm extends DirectorForm
}
/**
* @throws \Icinga\Exception\IcingaException
* @throws \Icinga\Exception\ProgrammingError
* @throws \Zend_Form_Exception
*/
@ -385,8 +391,19 @@ class KickstartForm extends DirectorForm
parent::onSuccess();
}
public function setDbResourceName($name)
{
$this->dbResourceName = $name;
return $this;
}
protected function getResourceName()
{
if ($this->dbResourceName !== null) {
return $this->dbResourceName;
}
if ($this->hasBeenSent()) {
$resource = $this->getSentValue('resource');
$resources = $this->enumResources();
@ -412,7 +429,6 @@ class KickstartForm extends DirectorForm
/**
* @return Migrations
* @throws \Icinga\Exception\IcingaException
*/
protected function migrations()
{