diff options
Diffstat (limited to 'catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb')
-rw-r--r-- | catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb | 53 |
1 files changed, 25 insertions, 28 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 97d140ab1f..bf8065b079 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,46 +1,43 @@ if node['disableHttp'] protocol = "https" + https_flag = "--https" be_port = node['BE']['https_port'] else protocol = "http" + https_flag = "" be_port = node['BE']['http_port'] end - -template "/var/tmp/user.py" do - source "user.py.erb" - sensitive true - mode 0755 - variables({ - :protocol => protocol, - :be_ip => node['Nodes']['BE'], - :be_port => be_port - }) +if node['BE']['user_conf'] + user_conf_dir = "--conf " + node['BE']['user_conf'] +else + # set default user configuration file + user_conf_dir = "" end bash "executing-create_user" do - code <<-EOH - python /var/tmp/user.py - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - EOH + code <<-EOH + sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{user_conf_dir} #{https_flag} + rc=$? + if [[ $rc != 0 ]]; then exit $rc; fi + EOH end template "/var/tmp/consumers.py" do - source "consumers.py.erb" - sensitive true - mode 0755 - variables({ - :protocol => protocol, - :be_ip => node['Nodes']['BE'], - :be_port => be_port - }) + source "consumers.py.erb" + sensitive true + mode 0755 + variables({ + :protocol => protocol, + :be_ip => node['Nodes']['BE'], + :be_port => be_port + }) end bash "executing-consumers" do - code <<-EOH - python /var/tmp/consumers.py - rc=$? - if [[ $rc != 0 ]]; then exit $rc; fi - EOH + code <<-EOH + python /var/tmp/consumers.py + rc=$? + if [[ $rc != 0 ]]; then exit $rc; fi + EOH end |