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

Remove the local zone name question in node wizard 

fixes #10724
This commit is contained in:
Gunnar Beutner 2015-11-30 08:25:37 +01:00 committed by Michael Friedrich
parent 2eac563c98
commit 8b74fc91a9
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/cli/nodewizardcommand.cpp
View File

@ -135,19 +135,6 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
String cn = answer; String cn = answer;
cn = cn.Trim(); cn = cn.Trim();
std::cout << ConsoleColorTag(Console_Bold)
<< "Please specifiy the local zone name"
<< ConsoleColorTag(Console_Normal) << " [" << cn << "]: ";
std::getline(std::cin, answer);
boost::algorithm::to_lower(answer);
if (answer.empty())
answer = cn;
String local_zone = answer;
local_zone = local_zone.Trim();
std::vector<std::string> endpoints; std::vector<std::string> endpoints;
String endpoint_buffer; String endpoint_buffer;
@ -481,7 +468,7 @@ wizard_ticket:
NodeUtility::CreateBackupFile(constants_file); NodeUtility::CreateBackupFile(constants_file);
NodeUtility::UpdateConstant("NodeName", cn); NodeUtility::UpdateConstant("NodeName", cn);
NodeUtility::UpdateConstant("ZoneName", local_zone); NodeUtility::UpdateConstant("ZoneName", cn);
} else { } else {
/* master setup */ /* master setup */
std::cout << ConsoleColorTag(Console_Bold) << "Starting the Master setup routine...\n"; std::cout << ConsoleColorTag(Console_Bold) << "Starting the Master setup routine...\n";