diff options
Diffstat (limited to 'catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes')
3 files changed, 11 insertions, 7 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 ee794c2fa6..14085bd0cb 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 @@ -3,7 +3,8 @@ template "/tmp/user.py" do sensitive true mode 0755 variables({ - :be_ip => node['Nodes']['BE'] + :be_ip => node['Nodes']['BE'], + :be_port => node['BE']['http_port'] }) end @@ -20,7 +21,8 @@ template "/tmp/consumers.py" do sensitive true mode 0755 variables({ - :be_ip => node['Nodes']['BE'] + :be_ip => node['Nodes']['BE'], + :be_port => node['BE']['http_port'] }) 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 397930d9dd..b929637b1a 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 @@ -3,7 +3,8 @@ template "/tmp/check_Backend_Health.py" do sensitive true mode 0755 variables({ - :be_ip => node['Nodes']['BE'] + :be_ip => node['Nodes']['BE'], + :be_port => node['BE']['http_port'] }) end 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 a8d474b792..e8dc9675d1 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 @@ -3,6 +3,7 @@ cookbook_file "/tmp/normatives.tar.gz" do end be_ip=node['Nodes'][:BE] +be_port=node['BE']['http_port'] bash "excuting-import_Normatives" do code <<-EOH @@ -16,21 +17,21 @@ bash "excuting-import_Normatives" do # add --debug=true to the importNormativeAll.py arguments to enable debug check_normative="/tmp/check_normative.out" - status_code=$(curl -s -o ${check_normative} -w "%{http_code}\\n" -X GET -H 'Content-Type: application/json;charset=UTF-8' -H 'USER_ID: jh0003' -H 'X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090' "http://#{be_ip}:8080/sdc2/rest/v1/screen") + status_code=$(curl -s -o ${check_normative} -w "%{http_code}\\n" -X GET -H 'Content-Type: application/json;charset=UTF-8' -H 'USER_ID: jh0003' -H 'X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090' "http://#{be_ip}:#{be_port}/sdc2/rest/v1/screen") if [ "$status_code" != 200 ] ; then exit "$status_code" fi - #curl -s -X GET -H "Content-Type: application/json;charset=UTF-8" -H "USER_ID: jh0003" -H "X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090" "http://#{be_ip}:8080/sdc2/rest/v1/screen" > ${check_normative} + #curl -s -X GET -H "Content-Type: application/json;charset=UTF-8" -H "USER_ID: jh0003" -H "X-ECOMP-RequestID: cbe744a0-037b-458f-aab5-df6e543c4090" "http://#{be_ip}:#{be_port}/sdc2/rest/v1/screen" > ${check_normative} resources_len=`cat ${check_normative}| jq '.["resources"]|length'` mkdir -p /var/lib/jetty/logs if [ $resources_len -eq 0 ] ; then - python importONAPNormativeAll.py -i #{be_ip} > /var/lib/jetty/logs/importNormativeAll.log + python importONAPNormativeAll.py -i #{be_ip} -p #{be_port} > /var/lib/jetty/logs/importNormativeAll.log rc=$? if [[ $rc != 0 ]]; then exit $rc; fi else - python upgradeONAPNormative.py -i #{be_ip} > /var/lib/jetty/logs/upgradeNormative.log + python upgradeONAPNormative.py -i #{be_ip} -p #{be_port} > /var/lib/jetty/logs/upgradeNormative.log rc=$? if [[ $rc != 0 ]]; then exit $rc; fi fi |