Refactoring the check backend, create consumers

[sdc.git] / catalog-be / sdc-backend-init / chef-repo / cookbooks / sdc-catalog-be-setup / recipes / 1_create_consumer_and_user.rb

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 bf8065b..68cfcab 100644 (file)
--- 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
@@ -15,29 +15,20 @@ else
   user_conf_dir = ""
 end
 
-bash "executing-create_user" do
+bash "executing-create_users" do
   code <<-EOH
     sdcuserinit -i #{node['Nodes']['BE']} -p #{be_port} #{user_conf_dir} #{https_flag}
     rc=$?
     if [[ $rc != 0 ]]; then exit $rc; fi
   EOH
+  returns [0]
 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
-  })
-end
-
-bash "executing-consumers" do
+bash "executing-create_consumers" do
   code <<-EOH
-    python /var/tmp/consumers.py
+    sdcconsumerinit -i #{node['Nodes']['BE']} -p #{be_port} #{https_flag}
     rc=$?
     if [[ $rc != 0 ]]; then exit $rc; fi
   EOH
+  returns [0]
 end