diff options
Diffstat (limited to 'catalog-be/sdc-backend-init')
4 files changed, 47 insertions, 5 deletions
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb index 792d600548..682885312e 100644 --- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb +++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/attributes/default.rb @@ -1 +1,5 @@ -# +#BasicAuth +default['basic_auth']['enabled'] = true +default['basic_auth'][:user_name] = "testName" +default['basic_auth'][:user_pass] = "testPass" + 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 68cfcab6ea..5585bc0b25 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 @@ -1,3 +1,4 @@ +require 'base64' if node['disableHttp'] protocol = "https" https_flag = "--https" @@ -15,9 +16,21 @@ else user_conf_dir = "" end +if node['basic_auth'] + basic_auth_enabled = node['basic_auth']['enabled'] + basic_auth_user = node['basic_auth']['user_name'] + basic_auth_pass = node['basic_auth']['user_pass'] + if basic_auth_enabled + basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass) + else + # set default user configuration file + basic_auth_config = "" + end +end + bash "executing-create_users" do code <<-EOH - sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{user_conf_dir} #{https_flag} + 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 @@ -26,7 +39,7 @@ end bash "executing-create_consumers" do code <<-EOH - sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{https_flag} + sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} rc=$? if [[ $rc != 0 ]]; then exit $rc; fi EOH 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 e35caed5b1..ffa1fee66b 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 @@ -1,3 +1,4 @@ +require 'base64' if node['disableHttp'] protocol = "https" https_flag = "--https" @@ -8,9 +9,21 @@ else be_port = node['BE']['http_port'] end +if node['basic_auth'] + basic_auth_enabled = node['basic_auth']['enabled'] + basic_auth_user = node['basic_auth']['user_name'] + basic_auth_pass = node['basic_auth']['user_pass'] + if basic_auth_enabled + basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass) + else + # set default user configuration file + basic_auth_config = "" + end +end + bash "executing-check_backend_health" do code <<-EOH - sdccheckbackend -i #{node['Nodes']['BE']} -p #{be_port} #{https_flag} + sdccheckbackend -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} rc=$? if [[ $rc != 0 ]]; then exit $rc; fi EOH 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 e9e44c0df9..04fb25f49e 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 @@ -1,3 +1,4 @@ +require 'base64' be_ip=node['Nodes'][:BE] if node['disableHttp'] @@ -10,6 +11,17 @@ else param="-i #{be_ip} -p #{be_port}" end +if node['basic_auth'] + basic_auth_enabled = node['basic_auth']['enabled'] + basic_auth_user = node['basic_auth']['user_name'] + basic_auth_pass = node['basic_auth']['user_pass'] + if basic_auth_enabled + basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass) + else + # set default user configuration file + basic_auth_config = "" + end +end cookbook_file "/var/tmp/normatives.tar.gz" do source "normatives.tar.gz" end @@ -25,7 +37,7 @@ bash "executing-import_Normatives" do # add --debug to the sdcinit command to enable debug cd /var/tmp/normatives/import/tosca - sdcinit #{param} > /var/lib/jetty/logs/init.log + sdcinit #{param} #{basic_auth_config} > /var/lib/jetty/logs/init.log rc=$? if [[ $rc != 0 ]]; then exit $rc; fi |