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

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

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-08-05 18:26:39 +03:00
commit cff441696d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/providers/ec2.rb
View File

@ -91,7 +91,7 @@ module Provider
convert_server list[0]["instancesSet"][0]
end
def create_server s, image, flavor, subnets, groups, out
def create_server s, image, flavor, subnets, groups, out, options={}
out << "Creating server for project '#{s.project} - #{s.deploy_env}'\n"
options = {
"InstanceType" => flavor,

2
devops-service/providers/openstack.rb
View File

@ -91,7 +91,7 @@ module Provider
end
end
def create_server s, image, flavor, subnets, groups, out
def create_server s, image, flavor, subnets, groups, out, options={}
out << "Creating server for project '#{s.project} - #{s.deploy_env}'\n"
if s.chef_node_name.nil?
out << "Generate new instance name: "

2
devops-service/providers/static.rb
View File

@ -47,7 +47,7 @@ module Provider
"static-#{s.project}-#{s.deploy_env}-#{Time.now.to_i}"
end
def create_server s, image, flavor, subnets, groups, out
def create_server s, image, flavor, subnets, groups, out, options={}
out << "Unsupported operation: ca not create server for provider 'static'"
false
end