diff options
Diffstat (limited to 'catalog-be/sdc-backend-init/chef-repo')
3 files changed, 13 insertions, 39 deletions
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb index dcf963fc29..3aabb0a10e 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb @@ -28,20 +28,11 @@ if node['basic_auth'] end end -bash "executing-create_users" do - code <<-EOH - sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{user_conf_dir} #{https_flag} - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - EOH - returns [0] +execute "executing-create_users" do + command "sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{user_conf_dir} #{https_flag}" + action :run end - -bash "executing-create_consumers" do - code <<-EOH - sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - EOH - returns [0] +execute "executing-create_consumers" do + command "sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag}" + action :run end diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb index 27b1a7d5b9..2e479e0848 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb @@ -21,11 +21,7 @@ if node['basic_auth'] end end -bash "executing-check_backend_health" do - code <<-EOH - sdccheckbackend -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - EOH - returns [0] +execute "executing-check_backend_health" do + command "sdccheckbackend -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag}" + action :run end
\ No newline at end of file diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb index 0abda0d07a..be32e98f2b 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb @@ -26,21 +26,8 @@ cookbook_file "/var/tmp/normatives.tar.gz" do source "normatives.tar.gz" end -bash "executing-import_Normatives" do - code <<-EOH - set -ex - - cd /var/tmp/ - tar -xvf normatives.tar.gz - - # executing the normatives - # add --debug to the sdcinit command to enable debug - - cd /var/tmp/normatives/import/tosca - sdcinit #{param} #{basic_auth_config} > /var/lib/jetty/logs/init.log - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - - EOH - returns [0] +execute "create-jetty-modules" do + command "set -ex && tar -xvf normatives.tar.gz && cd /var/tmp/normatives/import/tosca && sdcinit #{param} #{basic_auth_config} > #{ENV['ONAP_LOG']}/init.log" + cwd "/var/tmp/" + action :run end |