X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=catalog-be%2Fsdc-backend-init%2Fchef-repo%2Fcookbooks%2Fsdc-catalog-be-setup%2Frecipes%2F1_create_consumer_and_user.rb;fp=catalog-be%2Fsdc-backend-init%2Fchef-repo%2Fcookbooks%2Fsdc-catalog-be-setup%2Frecipes%2F1_create_consumer_and_user.rb;h=5de3453bf05cc9eb610a79ab70f5c14d0d875907;hb=532abef3013434369b0d6a126b417db7b6134bd2;hp=3aabb0a10e5bd3695655fbdefdcdb6563ca7f6a3;hpb=c6d49ae4af0b13bd0f75a878ffa88487ef38afc2;p=sdc.git 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 3aabb0a10e..5de3453bf0 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,6 +3,16 @@ if node['disableHttp'] protocol = "https" https_flag = "--https" be_port = node['BE']['https_port'] + if node['BE-init']['tls_cert'] && node['BE-init']['tls_key'] + tls_key = "--tls_key " + node['BE-init']['tls_key'] + tls_cert = "--tls_cert " + node['BE-init']['tls_cert'] + if node['BE-init']['tls_password'] + tls_key_pw = "--tls_key_pw " + node['BE-init']['tls_password'] + end + end + if node['BE-init']['ca_cert'] + ca_cert = "--ca_cert " + node['BE-init']['ca_cert'] + end else protocol = "http" https_flag = "" @@ -29,10 +39,10 @@ if node['basic_auth'] end execute "executing-create_users" do - command "sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{user_conf_dir} #{https_flag}" + command "sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{user_conf_dir} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" action :run end execute "executing-create_consumers" do - command "sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag}" + command "sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{basic_auth_config} #{https_flag} #{tls_cert} #{tls_key} #{tls_key_pw} #{ca_cert}" action :run end