commit f15c4816d649ed13062f036445e901c592af8f88
author Ondrej Smola <osmola@mirantis.com> Tue Feb 27 08:56:01 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Feb 27 08:56:01 2018 +0000
tree c4bc3bd5528e0bfd873585cf404ae15fa9d6fef9
parent 980037167a156da7178c77a50aa9fc78e44bd4cd
parent 240de3e0e090ed5e8ad8f21bc33d2826cf2b412c

Merge "Add kube-manager to doctrail"

opencontrail/files/3.0/database/cassandra-env.sh

diff --git a/opencontrail/files/3.0/database/cassandra-env.sh b/opencontrail/files/3.0/database/cassandra-env.sh
index 2eb5fbd..b48e4cc 100644
--- a/opencontrail/files/3.0/database/cassandra-env.sh
+++ b/opencontrail/files/3.0/database/cassandra-env.sh
@@ -314,3 +314,8 @@
 JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS"
 JVM_OPTS="$JVM_OPTS $MX4J_PORT"
 JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS"
+
+# Add cassandra pid file, even if not used. It will stay in params and
+# contrail-nodemgr can detect cassandra PID from process list.
+
+JVM_OPTS="$JVM_OPTS -Dcassandra-pidfile=/var/run/cassandra/cassandra.pid"

opencontrail/files/4.0/database/cassandra-env.sh

diff --git a/opencontrail/files/4.0/database/cassandra-env.sh b/opencontrail/files/4.0/database/cassandra-env.sh
index 6b70455..7f2145c 100644
--- a/opencontrail/files/4.0/database/cassandra-env.sh
+++ b/opencontrail/files/4.0/database/cassandra-env.sh
@@ -314,3 +314,8 @@
 JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS"
 JVM_OPTS="$JVM_OPTS $MX4J_PORT"
 JVM_OPTS="$JVM_OPTS $JVM_EXTRA_OPTS"
+
+# Add cassandra pid file, even if not used. It will stay in params and
+# contrail-nodemgr can detect cassandra PID from process list.
+
+JVM_OPTS="$JVM_OPTS -Dcassandra-pidfile=/var/run/cassandra/cassandra.pid"