From df353be353e1ec25ac2a0e64a9eb617dcbc87703 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 21 Sep 2020 22:13:05 +0200 Subject: Use integration-java11 Dockerfile Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC Issue-ID: SDC-3298 Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3 Signed-off-by: xuegao --- .../cassandra-actions/recipes/03-schemaCreation.rb | 31 ++++++++-------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb') diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb index a62550eeae..e60740fb3d 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb @@ -3,15 +3,12 @@ cookbook_file "/tmp/sdctool.tar" do mode 0755 end -## extract sdctool.tar -bash "install tar" do +execute "install tar" do + command "/bin/tar xf /tmp/sdctool.tar -C /tmp" cwd "/tmp" - code <<-EOH - /bin/tar xf /tmp/sdctool.tar -C /tmp - EOH + action :run end - template "janusgraph.properties" do sensitive true path "/tmp/sdctool/config/janusgraph.properties" @@ -49,19 +46,13 @@ template "/tmp/sdctool/config/configuration.yaml" do }) end - - -bash "executing-schema-creation" do - code <<-EOH - cd /tmp - chmod +x /tmp/sdctool/scripts/schemaCreation.sh - /tmp/sdctool/scripts/schemaCreation.sh /tmp/sdctool/config - EOH +execute "executing-schema-creation" do + command "chmod +x /tmp/sdctool/scripts/schemaCreation.sh && /tmp/sdctool/scripts/schemaCreation.sh /tmp/sdctool/config" + cwd "/tmp" + action :run end -bash "executing-janusGraphSchemaCreation.sh" do - code <<-EOH - chmod +x /tmp/sdctool/scripts/janusGraphSchemaCreation.sh - /tmp/sdctool/scripts/janusGraphSchemaCreation.sh /tmp/sdctool/config - EOH -end +execute "executing-janusGraphSchemaCreation.sh" do + command "chmod +x /tmp/sdctool/scripts/janusGraphSchemaCreation.sh && /tmp/sdctool/scripts/janusGraphSchemaCreation.sh /tmp/sdctool/config" + action :run +end \ No newline at end of file -- cgit 1.2.3-korg