diff --git a/devops-service/commands/knife_commands.rb b/devops-service/commands/knife_commands.rb index ba56e0e..00ca6c6 100644 --- a/devops-service/commands/knife_commands.rb +++ b/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", diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index 7227a95..fc725db 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/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"