chef-vpc-toolkit 2.8.1 → 2.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG CHANGED
@@ -1,3 +1,9 @@
1
+ * Sun Jan 15 2011 Dan Prince <dan.prince@rackspace.com> - 2.8.2
2
+ -Check if known_hosts exists before trying to edit it
3
+ -Add SERVER_GROUP_JSON option to create task.
4
+ -Updates to support Openstack. Ids for images, flavors and servers are
5
+ treated as strings.
6
+
1
7
  * Tue Dec 8 2011 Dan Prince <dan.prince@rackspace.com> - 2.8.1
2
8
  - Add JSON option for chef:install task to specify custom nodes.json files.
3
9
  - Don't re-add the notification handler to the config file if it already
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.8.1
1
+ 2.8.2
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{chef-vpc-toolkit}
8
- s.version = "2.7.2"
8
+ s.version = "2.8.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Dan Prince"]
12
- s.date = %q{2011-11-06}
12
+ s.date = %q{2012-01-15}
13
13
  s.default_executable = %q{chef-vpc-toolkit}
14
14
  s.description = %q{The Chef VPC Toolkit is a set of Rake tasks that provide a framework to help automate the creation and configuration of cloud server groups for development or testing. Requires Cloud Servers VPC.}
15
15
  s.email = %q{dan.prince@rackspace.com}
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
25
25
  "Rakefile",
26
26
  "VERSION",
27
27
  "bin/chef-vpc-toolkit",
28
+ "chef-vpc-toolkit.gemspec",
28
29
  "config/chef_installer.yml",
29
30
  "config/databags.json.example",
30
31
  "config/nodes.json",
@@ -49,7 +50,6 @@ Gem::Specification.new do |s|
49
50
  "cookbook-repos/local/cookbooks/motd/templates/default/motd.erb",
50
51
  "cookbook-repos/local/roles/README",
51
52
  "lib/chef-vpc-toolkit.rb",
52
- "lib/chef-vpc-toolkit/chef-0.9.bash",
53
53
  "lib/chef-vpc-toolkit/chef_bootstrap/centos.bash",
54
54
  "lib/chef-vpc-toolkit/chef_bootstrap/debian.bash",
55
55
  "lib/chef-vpc-toolkit/chef_bootstrap/fedora.bash",
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
57
57
  "lib/chef-vpc-toolkit/chef_bootstrap/ubuntu-opscode.bash",
58
58
  "lib/chef-vpc-toolkit/chef_bootstrap/ubuntu.bash",
59
59
  "lib/chef-vpc-toolkit/chef_bootstrap/unknown.bash",
60
+ "lib/chef-vpc-toolkit/chef_functions.bash",
60
61
  "lib/chef-vpc-toolkit/chef_installer.rb",
61
62
  "lib/chef-vpc-toolkit/cloud-servers-vpc/client.rb",
62
63
  "lib/chef-vpc-toolkit/cloud-servers-vpc/connection.rb",
@@ -25,9 +25,9 @@ class Server
25
25
  @description=options[:description] or @description=@name
26
26
  @external_ip_addr=options[:external_ip_addr]
27
27
  @internal_ip_addr=options[:internal_ip_addr]
28
- @cloud_server_id_number=options[:cloud_server_id_number].to_i
29
- @flavor_id=options[:flavor_id].to_i
30
- @image_id=options[:image_id].to_i
28
+ @cloud_server_id_number=options[:cloud_server_id_number]
29
+ @flavor_id=options[:flavor_id]
30
+ @image_id=options[:image_id]
31
31
  @admin_password=options[:admin_password]
32
32
  @server_group_id=options[:server_group_id].to_i
33
33
  @openvpn_server = [true, "true"].include?(options[:openvpn_server])
@@ -5,6 +5,7 @@ module SshUtil
5
5
  def self.remove_known_hosts_ip(ip, known_hosts_file=File.join(ENV['HOME'], ".ssh", "known_hosts"))
6
6
 
7
7
  return if ip.nil? or ip.empty?
8
+ return if not FileTest.exist?(known_hosts_file)
8
9
 
9
10
  existing=IO.read(known_hosts_file)
10
11
  File.open(known_hosts_file, 'w') do |file|
@@ -13,7 +13,12 @@ namespace :group do
13
13
  desc "Create a new group of cloud servers"
14
14
  task :create => [ "init", "chef:validate_json" ] do
15
15
 
16
- sg=ServerGroup.from_json_config(IO.read(ServerGroup::CONFIG_FILE))
16
+ json_config_file=ENV['SERVER_GROUP_JSON']
17
+ if json_config_file.nil? then
18
+ json_config_file = ServerGroup::CONFIG_FILE
19
+ end
20
+
21
+ sg=ServerGroup.from_json_config(IO.read(json_config_file))
17
22
  sg=ServerGroup.create(sg)
18
23
  puts "Server group ID #{sg.id} created."
19
24
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-vpc-toolkit
3
3
  version: !ruby/object:Gem::Version
4
- hash: 45
4
+ hash: 43
5
5
  prerelease: false
6
6
  segments:
7
7
  - 2
8
8
  - 8
9
- - 1
10
- version: 2.8.1
9
+ - 2
10
+ version: 2.8.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-12-08 00:00:00 -05:00
18
+ date: 2012-01-15 00:00:00 -05:00
19
19
  default_executable: chef-vpc-toolkit
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency