tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

#713: done

Browse Source
This commit is contained in:
amartynov 2015-09-28 14:10:14 +03:00
parent d354edd84f
commit f06162e45f
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devops-service/db/mongo/models/report.rb
View File

@ -9,9 +9,10 @@ module Devops
BOOTSTRAP_TYPE = 3 BOOTSTRAP_TYPE = 3
PROJECT_TEST_TYPE = 4 PROJECT_TEST_TYPE = 4
STACK_TYPE = 5 STACK_TYPE = 5
DELETE_SERVER_TYPE = 6 DEPLOY_STACK_TYPE = 6
DELETE_SERVER_TYPE = 7
attr_accessor :id, :file, :created_at, :updated_at, :created_by, :project, :deploy_env, :type, :chef_node_name, :host, :status attr_accessor :id, :file, :created_at, :updated_at, :created_by, :project, :deploy_env, :type, :chef_node_name, :host, :status, :stack
def initialize r def initialize r
self.id = r["_id"] self.id = r["_id"]
@ -23,6 +24,7 @@ module Devops
self.created_at = r["created_at"] self.created_at = r["created_at"]
self.chef_node_name = r["chef_node_name"] self.chef_node_name = r["chef_node_name"]
self.host = r["host"] self.host = r["host"]
self.stack = r["stack"]
self.created_at = r["created_at"].localtime unless r["created_at"].nil? self.created_at = r["created_at"].localtime unless r["created_at"].nil?
self.updated_at = r["updated_at"].localtime unless r["updated_at"].nil? self.updated_at = r["updated_at"].localtime unless r["updated_at"].nil?
self.status = r["status"] self.status = r["status"]
@ -39,7 +41,8 @@ module Devops
"type" => self.type, "type" => self.type,
"chef_node_name" => self.chef_node_name, "chef_node_name" => self.chef_node_name,
"host" => self.host, "host" => self.host,
"status" => self.status "status" => self.status,
"stack" => self.stack
} }
end end

2
devops-service/db/mongo/models/server.rb
View File

@ -29,7 +29,7 @@ module Devops
set_validators ::Validators::DeployEnv::RunList set_validators ::Validators::DeployEnv::RunList
def self.fields def self.fields
["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by", "run_list"] ["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by", "run_list", "stack"]
end end
def initialize s={} def initialize s={}

7
devops-service/workers/deploy_worker.rb
View File

@ -31,11 +31,16 @@ class DeployWorker < Worker
"created_by" => owner, "created_by" => owner,
"project" => server.project, "project" => server.project,
"deploy_env" => server.deploy_env, "deploy_env" => server.deploy_env,
"type" => Devops::Model::Report::DEPLOY_TYPE,
"status" => STATUS::RUNNING, "status" => STATUS::RUNNING,
"chef_node_name" => server.chef_node_name, "chef_node_name" => server.chef_node_name,
"host" => server.public_ip || server.private_ip "host" => server.public_ip || server.private_ip
} }
if server.stack.nil?
report_data["type"] = Devops::Model::Report::DEPLOY_TYPE
else
report_data["type"] = Devops::Model::Report::DEPLOY_STACK_TYPE
report_data["stack"] = server.stack
end
report = Devops::Model::Report.new(report_data) report = Devops::Model::Report.new(report_data)
mongo.save_report(report) mongo.save_report(report)
report report