From 6602562f9e0cde4b890f2a66d7f023bf68aaee43 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 5 Sep 2013 09:56:36 -0400 Subject: [PATCH] replace compute_node_security_group config with generic compute_node_ec2run_args --- services/api/app/models/node.rb | 2 +- services/api/config/environments/development.rb.example | 2 +- services/api/config/environments/production.rb.example | 2 +- services/api/config/environments/test.rb.example | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/api/app/models/node.rb b/services/api/app/models/node.rb index 7dd6f9a708..cf1dd06693 100644 --- a/services/api/app/models/node.rb +++ b/services/api/app/models/node.rb @@ -109,7 +109,7 @@ class Node < ArvadosModel ping_url = ping_url_method.call({ uuid: self.uuid, ping_secret: self.info[:ping_secret] }) ec2_args = ["--user-data '#{ping_url}'", "-t c1.xlarge -n 1", - "-g", Rails.configuration.compute_node_security_group, + Rails.configuration.compute_node_ec2run_args, Rails.configuration.compute_node_ami ] ec2run_cmd = ["ec2-run-instances", diff --git a/services/api/config/environments/development.rb.example b/services/api/config/environments/development.rb.example index 8304ab96c6..2682565743 100644 --- a/services/api/config/environments/development.rb.example +++ b/services/api/config/environments/development.rb.example @@ -39,7 +39,7 @@ Server::Application.configure do # config.dnsmasq_conf_dir = '/etc/dnsmasq.d' # config.compute_node_ami = 'ami-cbca41a2' - # config.compute_node_security_group = 'arvados-compute' + # config.compute_node_ec2run_args = '-g arvados-compute' # config.compute_node_spot_bid = 0.11 # config.compute_node_domain = `hostname --domain`.strip diff --git a/services/api/config/environments/production.rb.example b/services/api/config/environments/production.rb.example index 3af489528a..2218e40423 100644 --- a/services/api/config/environments/production.rb.example +++ b/services/api/config/environments/production.rb.example @@ -68,7 +68,7 @@ Server::Application.configure do # config.dnsmasq_conf_dir = '/etc/dnsmasq.d' # config.compute_node_ami = 'ami-cbca41a2' - # config.compute_node_security_group = 'arvados-compute' + # config.compute_node_ec2run_args = '-g arvados-compute' # config.compute_node_spot_bid = 0.11 # config.compute_node_domain = `hostname --domain`.strip diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example index b62e787140..d0e271a6e2 100644 --- a/services/api/config/environments/test.rb.example +++ b/services/api/config/environments/test.rb.example @@ -45,7 +45,7 @@ Server::Application.configure do # config.dnsmasq_conf_dir = '/etc/dnsmasq.d' # config.compute_node_ami = 'ami-cbca41a2' - # config.compute_node_security_group = 'arvados-compute' + # config.compute_node_ec2run_args = '-g arvados-compute' # config.compute_node_spot_bid = 0.11 # config.compute_node_domain = `hostname --domain`.strip -- 2.30.2