Plugin-defined volume for contrail-db added

- custom location for cassandra data files introduced
- cassandra config templates updated
- volumes.yaml file added

Change-Id: I1c9933c614fe88f444232a7e8bc8a69d2a6df83b

deployment_scripts/puppet/modules/contrail/manifests/database.pp

@@ -49,7 +49,7 @@ class contrail::database {
   }
 
 # Cassandra
-  file { '/var/lib/cassandra':
+  file { $contrail::cassandra_path:
     ensure  => directory,
     mode    => '0755',
     owner   => 'cassandra',
@@ -75,7 +75,7 @@ class contrail::database {
   service { 'contrail-database':
     ensure    => running,
     enable    => true,
-    require   => [File['/var/lib/cassandra'],Package['contrail-openstack-database']],
+    require   => [File[$contrail::cassandra_path],Package['contrail-openstack-database']],
     subscribe => [
       File['/etc/cassandra/cassandra.yaml'],
       File['/etc/cassandra/cassandra-env.sh'],

deployment_scripts/puppet/modules/contrail/manifests/init.pp

@@ -49,6 +49,9 @@ $external = $settings['contrail_external']
 $route_target = $settings['contrail_route_target']
 $gateways = split($settings['contrail_gateways'], ',')
 
+# Custom mount point for contrail-db
+$cassandra_path='/var/lib/contrail_db'
+
 # Network configuration
 prepare_network_config($network_scheme)
 $interface=get_network_role_property('neutron/mesh', 'interface')

deployment_scripts/puppet/modules/contrail/templates/cassandra.yaml.erb

@@ -9,15 +9,15 @@ authorizer: AllowAllAuthorizer
 permissions_validity_in_ms: 2000
 partitioner: org.apache.cassandra.dht.Murmur3Partitioner
 data_file_directories:
-    - /var/lib/cassandra/data
-commitlog_directory: /var/lib/cassandra/commitlog
+    - <%= scope.lookupvar('contrail::cassandra_path') %>/data
+commitlog_directory: <%= scope.lookupvar('contrail::cassandra_path') %>/commitlog
 disk_failure_policy: stop
 key_cache_size_in_mb:
 key_cache_save_period: 14400
 row_cache_size_in_mb: 0
 row_cache_save_period: 0
 row_cache_provider: SerializingCacheProvider
-saved_caches_directory: /var/lib/cassandra/saved_caches
+saved_caches_directory: <%= scope.lookupvar('contrail::cassandra_path') %>/saved_caches
 commitlog_sync: periodic
 commitlog_sync_period_in_ms: 10000
 commitlog_segment_size_in_mb: 32

deployment_scripts/puppet/modules/contrail/templates/contrail-database-nodemgr.conf.erb

@@ -1,6 +1,6 @@
 [DEFAULT]
 hostip=<%= scope.lookupvar('contrail::address') %>
-minimum_diskGB=256
+minimum_diskGB=4
 
 [DISCOVERY]
 server=<%= scope.lookupvar('contrail::contrail_private_vip') %>

volumes.yaml

@@ -0,0 +1,20 @@
+volumes:
+  - id: "contrail-db"
+    type: "vg"
+    min_size:
+      generator: "calc_gb_to_mb"
+      generator_args: [256]
+    label: "Contrail Database"
+    volumes:
+      - mount: "/var/lib/contrail_db"
+        type: "lv"
+        name: "cassandra"
+        file_system: "ext4"
+        size:
+          generator: "calc_total_vg"
+          generator_args: ["contrail-db"]
+volumes_roles_mapping:
+  contrail-db:
+    - {allocate_size: "min", id: "os"}
+    - {allocate_size: "all", id: "contrail-db"}
+