summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-cassandra
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-07-25 22:53:44 +0300
committerMichael Lando <ml636r@att.com>2017-07-25 23:13:44 +0300
commit2d3e1cb660ccacc552063ca1f4d6ccc5fa3ea77b (patch)
tree006e89de8552d2e246550a0e5c45c1e85b96be37 /sdc-os-chef/sdc-cassandra
parent6917638ef4610e614dd568434d05b98b594881b5 (diff)
[SDC] fix import zip issue
Change-Id: I51ec3af1c31cf9fdbe39e235e54f24e110d6938f 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.rb10
-rwxr-xr-xsdc-os-chef/sdc-cassandra/startup.sh3
2 files changed, 0 insertions, 13 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 c6ff1487d3..f60c6977e0 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
@@ -2,16 +2,6 @@ working_directory = "/tmp"
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
- source "sdctool.tar"
-end
-
-bash "extract sdctool.tar" do
- cwd "#{working_directory}"
- code <<-EOH
- tar xvf /tmp/sdctool.tar
- EOH
-end
bash "import-Comformance" do
diff --git a/sdc-os-chef/sdc-cassandra/startup.sh b/sdc-os-chef/sdc-cassandra/startup.sh
index 6107f60396..2f7cc3c53d 100755
--- a/sdc-os-chef/sdc-cassandra/startup.sh
+++ b/sdc-os-chef/sdc-cassandra/startup.sh
@@ -1,9 +1,6 @@
#!/bin/bash
cd /root/chef-solo
-mkdir -p /root/chef-solo/cookbooks/cassandra-actions/attributes
-cl_rel=`basename /root/chef-solo/cookbooks/cassandra-actions/files/default/SDC* .zip|awk -F"-" '{print $2}'`
-echo "normal['version'] = \"${cl_rel}\"" > /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb
echo "normal['HOST_IP'] = \"${HOST_IP}\"" >> /root/chef-solo/cookbooks/cassandra-actions/attributes/default.rb
export CHEFNAME=${ENVNAME}