Unhardcoding compaction_throughput_mb_per_sec variable
Change-Id: Ib0c23246741131444c2c96e9043aa6775ae11eda
diff --git a/README.rst b/README.rst
index 20b043f..dac41c7 100644
--- a/README.rst
+++ b/README.rst
@@ -136,6 +136,7 @@
minimum_disk: 10
name: 'Contrail'
original_token: 0
+ compaction_throughput_mb_per_sec: 16
data_dirs:
- /var/lib/cassandra
id: 1
diff --git a/opencontrail/files/2.2/cassandra.yaml b/opencontrail/files/2.2/cassandra.yaml
index 3ec784d..f3ca089 100644
--- a/opencontrail/files/2.2/cassandra.yaml
+++ b/opencontrail/files/2.2/cassandra.yaml
@@ -579,7 +579,7 @@
# 16 to 32 times the rate you are inserting data is more than sufficient.
# Setting this to 0 disables throttling. Note that this account for all types
# of compaction, including validation compaction.
-compaction_throughput_mb_per_sec: 16
+compaction_throughput_mb_per_sec: {{ database.compaction_throughput_mb_per_sec }}
# When compacting, the replacement sstable(s) can be opened before they
# are completely written, and used in place of the prior sstables for
diff --git a/opencontrail/files/3.0/cassandra.yaml b/opencontrail/files/3.0/cassandra.yaml
index 3ec784d..f3ca089 100644
--- a/opencontrail/files/3.0/cassandra.yaml
+++ b/opencontrail/files/3.0/cassandra.yaml
@@ -579,7 +579,7 @@
# 16 to 32 times the rate you are inserting data is more than sufficient.
# Setting this to 0 disables throttling. Note that this account for all types
# of compaction, including validation compaction.
-compaction_throughput_mb_per_sec: 16
+compaction_throughput_mb_per_sec: {{ database.compaction_throughput_mb_per_sec }}
# When compacting, the replacement sstable(s) can be opened before they
# are completely written, and used in place of the prior sstables for
diff --git a/opencontrail/files/4.0/cassandra.yaml b/opencontrail/files/4.0/cassandra.yaml
index 3ec784d..f3ca089 100644
--- a/opencontrail/files/4.0/cassandra.yaml
+++ b/opencontrail/files/4.0/cassandra.yaml
@@ -579,7 +579,7 @@
# 16 to 32 times the rate you are inserting data is more than sufficient.
# Setting this to 0 disables throttling. Note that this account for all types
# of compaction, including validation compaction.
-compaction_throughput_mb_per_sec: 16
+compaction_throughput_mb_per_sec: {{ database.compaction_throughput_mb_per_sec }}
# When compacting, the replacement sstable(s) can be opened before they
# are completely written, and used in place of the prior sstables for
diff --git a/opencontrail/map.jinja b/opencontrail/map.jinja
index 4329ed7..9b91cca 100644
--- a/opencontrail/map.jinja
+++ b/opencontrail/map.jinja
@@ -73,12 +73,14 @@
['cassandra', 'zookeeper', 'supervisor', 'openjdk-8-jre-headless', 'contrail-database']
{%- endif %}
cassandra_config: '/etc/cassandra/'
+ compaction_throughput_mb_per_sec: 16
services:
['supervisord-contrail-database', 'zookeeper']
RedHat:
pkgs:
['contrail-openstack-database', 'zookeeper', 'supervisor', 'java-1.7.0-openjdk-headless']
cassandra_config: '/etc/cassandra/conf/'
+ compaction_throughput_mb_per_sec: 16
services:
['supervisord-contrail-database', 'zookeeper']
web:
@@ -184,12 +186,14 @@
['cassandra', 'zookeeper', 'supervisor', 'openjdk-8-jre-headless', 'contrail-openstack-database']
{%- endif %}
cassandra_config: '/etc/cassandra/'
+ compaction_throughput_mb_per_sec: 16
services:
['supervisord-contrail-database', 'zookeeper']
RedHat:
pkgs:
['contrail-openstack-database', 'zookeeper', 'supervisor', 'java-1.7.0-openjdk-headless']
cassandra_config: '/etc/cassandra/conf/'
+ compaction_throughput_mb_per_sec: 16
services:
['supervisord-contrail-database', 'zookeeper']
web: