Merge "Move the health check script to /usr/bin."

Juniper · Dec 1, 2016 · dd4efda · dd4efda
2 parents 99a8ec1 + 8095b03
commit dd4efda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/vnsw/agent/contrail/SConscript b/src/vnsw/agent/contrail/SConscript
@@ -108,7 +108,6 @@ env.Alias('contrail-vrouter-agent', contrail_vrouter_agent)
 env.Default(contrail_vrouter_agent)
 
 utils_scripts = [
-  'contrail-vrouter-agent-health-check.py',
   'agent_dissector.lua',
   'mpls_dissector.lua',
   'qosmap.py']
@@ -122,6 +121,7 @@ doc_files += env['AGENT_FLOW_DOC_FILES']
 
 # Please update sandesh/common/vns.sandesh on process name change
 env.Alias('install', env.Install(env['INSTALL_BIN'], contrail_vrouter_agent))
+env.Alias('install', env.Install(env['INSTALL_BIN'], 'contrail-vrouter-agent-health-check.py'))
 for utils in utils_scripts:
   env.Alias('install', env.Install(env['INSTALL_EXAMPLE'], utils))
 env.Alias('install', env.Install(env['INSTALL_CONF'],

diff --git a/src/vnsw/agent/oper/health_check.cc b/src/vnsw/agent/oper/health_check.cc
@@ -29,7 +29,7 @@ SandeshTraceBufferPtr
 HealthCheckTraceBuf(SandeshTraceBufferCreate("HealthCheck", 5000));
 
 const std::string HealthCheckInstance::kHealthCheckCmd
-("/usr/share/contrail-utils/contrail-vrouter-agent-health-check.py");
+("/usr/bin/contrail-vrouter-agent-health-check.py");
 
 HealthCheckService::HealthCheckService(const HealthCheckTable *table,
                                        const boost::uuids::uuid &id) :