Merge branch 'devops_3' of git.stu.neva.ru:cloudtechlab/devops-service into devops_3

devops-service/commands/knife_commands.rb

@@ -48,7 +48,8 @@ class KnifeCommands
   "json_class": "Chef::Role",
   "default_attributes": {
     "project": "#{project}",
-    "env": "#{env}"
+    "env": "#{env}",
+    "deploy_env": "#{env}"
   },
   "override_attributes": {},
   "chef_type": "role",

devops-service/lib/executors/server_executor.rb

@@ -345,6 +345,8 @@ module Devops
           end
           @out.flush
           cmd << " -j http://#{DevopsConfig.config[:address]}:#{DevopsConfig.config[:port]}/#{DevopsConfig.config[:url_prefix]}/v2.0/deploy/data/#{file}"
+        else
+          cmd << " -r #{deploy_info["run_list"].join(",")}"
         end
         ip = if @server.public_ip.nil?
           @server.private_ip
@@ -425,7 +427,7 @@ module Devops
       def create_run_list out, deploy_info
         out << "\nGenerate run list hook...\n"
         if deploy_info["run_list"]
-          out << "Deploy info already contains 'run_list': #{deploy_info["run_list"].join(",")}\n"
+          out << "Deploy info already contains 'run_list': #{deploy_info["run_list"].join(", ")}\n"
           return
         end
         out << "Project run list: #{@project.run_list.join(", ")}\n"