Skip to content

Commit

Permalink
Merge "Default hostip to "127.0.0.1" instead of exiting if hostname i…
Browse files Browse the repository at this point in the history
…s not resolvable. One can provide the mapping from name to IP via configuration file or command line parameter" into R2.20
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Aug 7, 2015
2 parents 3e40abc + 05d4651 commit 43b418e
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/control-node/options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@ void Options::Initialize(EventManager &evm,
string hostname = host_name(error);
string host_ip = GetHostIp(evm.io_service(), hostname);

if (host_ip.empty()) {
cout << "Error! Cannot resolve host " << hostname <<
"to a valid IP address";
exit(-1);
}
if (host_ip.empty())
host_ip = "127.0.0.1";

opt::options_description generic("Generic options");

Expand Down

0 comments on commit 43b418e

Please sign in to comment.