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

Merge branch 'setting_ip_to_nodes' into features

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-01-13 14:24:31 +03:00
commit 7b0a9be4dc
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-client/lib/devops-client/handler/server.rb
View File

@ -71,7 +71,7 @@ class Server < Handler
:deploy_env => @args[3] :deploy_env => @args[3]
} }
[:key, :without_bootstrap, :name, :groups, :force].each do |k| [:key, :without_bootstrap, :name, :groups, :force, :private_ip].each do |k|
q[k] = self.options[k] unless self.options[k].nil? q[k] = self.options[k] unless self.options[k].nil?
end end

2
devops-client/lib/devops-client/options/server_options.rb
View File

@ -122,6 +122,8 @@ class ServerOptions < CommonOptions
options[:groups] = groups.split(",") options[:groups] = groups.split(",")
end end
parser.recognize_option_value(:private_ip, 'server', short: '-N', i18n_scope: 'create')
# it was disabled somewhy # it was disabled somewhy
# parser.on('--public-ip', "Associate public IP with server") do # parser.on('--public-ip', "Associate public IP with server") do
# options[:public_ip] = true # options[:public_ip] = true

3
devops-client/locales/en.yml
View File

@ -360,11 +360,12 @@ en:
unreserve: unreserve:
instance: Unreserve server by instance id instance: Unreserve server by instance id
create: create:
without-bootstrap: 'Run server without bootsraping phase' without_bootstrap: 'Run server without bootsraping phase'
name: Set node name name: Set node name
groups: The security groups for this server groups: The security groups for this server
force: Cancel rollback operation on error force: Cancel rollback operation on error
key: User another key for server key: User another key for server
private_ip: Private ip for this server
bootstrap: bootstrap:
name: Set chef name name: Set chef name
bootstrap_template: Bootstrap template bootstrap_template: Bootstrap template

3
devops-service/lib/executors/server_executor.rb
View File

@ -82,7 +82,8 @@ module Devops
"deploy_env" => @deploy_env.identifier, "deploy_env" => @deploy_env.identifier,
"created_by" => options["created_by"], "created_by" => options["created_by"],
"provider" => @deploy_env.provider, "provider" => @deploy_env.provider,
"provider_account" => @deploy_env.provider_account "provider_account" => @deploy_env.provider_account,
"private_ip" => options["private_ip"]
}) })
end end

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

@ -99,7 +99,8 @@ module Provider
options = { options = {
"InstanceType" => flavor, "InstanceType" => flavor,
# "Placement.AvailabilityZone" => s.options[:availability_zone], # "Placement.AvailabilityZone" => s.options[:availability_zone],
"KeyName" => self.ssh_key "KeyName" => self.ssh_key,
"PrivateIpAddress" => s.private_ip
} }
vpcId = nil vpcId = nil
unless subnets.empty? unless subnets.empty?