]> granicus.if.org Git - icinga2/commitdiff
Use the NodeName constant in 'api setup'
authorGunnar Beutner <gunnar@beutner.name>
Thu, 26 Nov 2015 07:09:24 +0000 (08:09 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Thu, 26 Nov 2015 07:12:13 +0000 (08:12 +0100)
fixes #10641

lib/cli/apisetupcommand.cpp

index 562a44d6449305713b89ad780616f5b09270ba81..8d6aa35fe4145235a1a4c28f28ae9689745ff488 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "cli/apisetupcommand.hpp"
 #include "cli/apisetuputility.hpp"
+#include "cli/variableutility.hpp"
 #include "base/logger.hpp"
 #include "base/console.hpp"
 #include <iostream>
@@ -55,7 +56,12 @@ int ApiSetupCommand::GetMaxArguments(void) const
  */
 int ApiSetupCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
 {
-       if (!ApiSetupUtility::SetupMaster(Utility::GetFQDN(), true))
+       String cn = VariableUtility::GetVariable("NodeName");
+
+       if (cn.IsEmpty())
+               cn = Utility::GetFQDN();
+
+       if (!ApiSetupUtility::SetupMaster(cn, true))
                return 1;
 
        return 0;