summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-cassandra
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-07-24 23:21:12 +0300
committerMichael Lando <ml636r@att.com>2017-07-24 23:21:12 +0300
commit3283393bab7cc57af2dc8b70419adbbb34af5c90 (patch)
tree4d6d2e5b02f9a747e90a64a1b64577b4e13fee9c /sdc-os-chef/sdc-cassandra
parente575ea8b9c775f72a906aea75c338e1fbb04df06 (diff)
[SDC] 1710 rebase
Change-Id: I119765d0a74f05722fc19586338fa49fd467095e Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-cassandra')
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/07-importComformance.rb9
1 files changed, 3 insertions, 6 deletions
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 4a04a9ba67..c6ff1487d3 100644
--- 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
@@ -13,22 +13,19 @@ bash "extract sdctool.tar" do
EOH
end
-cookbook_file "/tmp/sdctool/config/SDC.zip" do
- source "SDC-#{cl_release}.zip"
-end
bash "import-Comformance" do
cwd "#{working_directory}"
code <<-EOH
conf_dir=/tmp/sdctool/config
- schema_file_name=SDC.zip
+ tosca_dir=/tmp/sdctool/tosca
cl_version=`grep 'toscaConformanceLevel:' $conf_dir/configuration.yaml |awk '{print $2}'`
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} "
- ./sdcSchemaFileImport.sh ${conf_dir}/${schema_file_name} #{cl_release} ${cl_version} ${conf_dir}
+ echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir} "
+ ./sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir}
EOH
end