Closes-Bug: #1455253

Take care of database and topology conf file changes. 1. cassandra-env.sh - change Xss from 256K to 512K. 2. contrail-topology.conf - Add missing [ 3. contrail-database-nodemgr.conf - make minimum_diskGB parameterized. Change-Id: I377fec0da5b287b26b1fa0bbe9a16aa8b0d5aa04
Juniper · May 14, 2015 · 6e12d08 · 6e12d08
1 parent c85c244
commit 6e12d08
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/database.pp b/contrail/environment/modules/contrail/manifests/database.pp
@@ -57,6 +57,10 @@
 #     Values are true, false or on_failure
 #     (optional) - Defaults to false
 #
+# [*database_minimum_diskGB*]
+#     Minimum disk space needed in GB for database.
+#     (optional) - Defaults to 256
+#
 class contrail::database (
     $host_control_ip = $::contrail::params::host_ip,
     $config_ip = $::contrail::params::config_ip_to_use,
@@ -68,6 +72,7 @@
     $analytics_data_dir = $::contrail::params::analytics_data_dir,
     $ssd_data_dir = $::contrail::params::ssd_data_dir,
     $contrail_logoutput = $::contrail::params::contrail_logoutput,
+    $database_minimum_diskGB = $::contrail::params::database_minimum_diskGB,
 ) inherits ::contrail::params {
     # Main Class code
     case $::operatingsystem {

diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
@@ -144,6 +144,10 @@
 #     Directory used for ssd data files.
 #     (optional) - Defaults to "" (use database_dir). UI parameter.
 #
+# [*database_minimum_diskGB*]
+#     Minimum disk space needed in GB for database.
+#     (optional) - Defaults to 256
+#
 # [*keystone_ip*]
 #     Control interface IP address of server where keystone service is
 #     running. Used only in non-HA configuration, where keystone service
@@ -540,6 +544,7 @@
     $database_dir = "/var/lib/cassandra",
     $analytics_data_dir = "",
     $ssd_data_dir = "",
+    $database_minimum_diskGB = 256,
     $keystone_ip = "",
     $keystone_admin_password = "contrail123",
     $keystone_service_token = "contrail123",

diff --git a/contrail/environment/modules/contrail/templates/cassandra-env.sh.erb b/contrail/environment/modules/contrail/templates/cassandra-env.sh.erb
@@ -190,7 +190,7 @@ if [ "`uname`" = "Linux" ] ; then
     # be pooled anyway.) Only do so on Linux where it is known to be
     # supported.
     # u34 and greater need 180k
-    JVM_OPTS="$JVM_OPTS -Xss256k"
+    JVM_OPTS="$JVM_OPTS -Xss512k"
 fi
 echo "xss = $JVM_OPTS"
 

diff --git a/contrail/environment/modules/contrail/templates/contrail-database-nodemgr.conf.erb b/contrail/environment/modules/contrail/templates/contrail-database-nodemgr.conf.erb
@@ -1,6 +1,6 @@
 [DEFAULT]
 hostip=<%= @host_control_ip %>
-minimum_diskGB=256
+minimum_diskGB=<%= @database_minimum_diskGB %>
 
 [DISCOVERY]
 server=<%= @config_ip %>

diff --git a/contrail/environment/modules/contrail/templates/contrail-topology.conf.erb b/contrail/environment/modules/contrail/templates/contrail-topology.conf.erb
@@ -1,4 +1,4 @@
-DEFAULTS]
+[DEFAULTS]
 log_local = 1
 log_level = SYS_NOTICE
 #log_category = ''