[sdc] update code of sdc

[sdc.git] / sdc-os-chef / sdc-cassandra / chef-repo / cookbooks / cassandra-actions / recipes / 07-importComformance.rb

diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb
index 7c902ea..4a04a9b 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb
@@ -1,5 +1,5 @@
 working_directory =  "/tmp"
-cl_release="1.1.0"
+cl_release=node['version'].split('.')[0..2].join('.').split('-')[0]
 printf("\033[33mcl_release=[%s]\n\033[0m", cl_release)
 
 cookbook_file "/tmp/sdctool.tar" do
@@ -27,7 +27,7 @@ bash "import-Comformance" do
 
     cd /tmp/sdctool/scripts
     /bin/chmod +x sdcSchemaFileImport.sh
-    echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh $conf_dir/$schema_file_name #{cl_release} $cl_version $conf_dir "
+    echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh $conf_dir/$schema_file_name #{cl_release} ${cl_version} ${conf_dir} "
     ./sdcSchemaFileImport.sh ${conf_dir}/${schema_file_name} #{cl_release} ${cl_version} ${conf_dir} 
   EOH
 end