knife-cloudstack 0.0.11 → 0.0.12

data/CHANGES.rdoc

@@ -1,5 +1,11 @@
 = Changes
 
+== 2012-05-17 (0.0.12)
+* Adding option to disable public IP allocation on server create
+  https://github.com/CloudStack/knife-cloudstack/pull/8
+* Fix whitespace issue in network names
+  https://github.com/CloudStack/knife-cloudstack/pull/7
+
 == 2011-11-03 (0.0.11)
 * Added LICENSE file and licensing headers to source. No feature changes.
 

data/README.rdoc

@@ -51,6 +51,8 @@ system so it can run Chef Client with a Chef Server. The main assumption is a ba
 intended for Chef Client systems that talk to a Chef server.  By default the server is bootstrapped using the {ubuntu10.04-gems}[https://github.com/opscode/chef/bl
 ob/master/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb] template.  This can be overridden using the <tt>-d</tt> or <tt>--template-file</tt> command options.
 
+By default, new servers are allocated a public IP address mapping to the CloudStack private IP address. If you do not want this behavior, pass the <tt>--no-public-ip</tt> option.
+
 ==== Port forwarding rules for virtual networks
 The <tt>--port-rules</tt> option takes a comma separated list of port forwarding rules. These rules are created on the
 virtual public ip address of the server. Note that this option only applies to servers using a virtual network; it is
@@ -194,6 +196,8 @@ Reboots the specified virtual machines(s).
 
 Author:: Ryan Holmes <rholmes@edmunds.com> 
 Author:: KC Braunschweig <kbraunschweig@edmunds.com>
+Author:: John E. Vincent <lusis.org+github.com@gmail.com>
+
 Copyright:: Copyright (c) 2011 Edmunds, Inc.
 License:: Apache License, Version 2.0
 

data/lib/chef/knife/cs_server_create.rb

@@ -62,9 +62,15 @@ module KnifeCloudstack
            :short => "-W NETWORKS",
            :long => "--networks NETWORK",
            :description => "Comma separated list of CloudStack network names",
-           :proc => lambda { |n| n.split(/[\s,]+/) },
+           :proc => lambda { |n| n.split(',').map {|sn| sn.strip}} ,
            :default => []
 
+    option :public_ip,
+           :long => "--[no-]public-ip",
+           :description => "Allocate a public IP for this server",
+           :boolean => true,
+           :default => true
+
     option :chef_node_name,
            :short => "-N NAME",
            :long => "--node-name NAME",
@@ -228,15 +234,15 @@ module KnifeCloudstack
 
     def find_or_create_public_ip(server, connection)
       nic = connection.get_server_default_nic(server) || {}
-      if nic['type'] == 'Virtual' then
+      #puts "#{ui.color("Not allocating public IP for server", :red)}" unless config[:public_ip]
+      if (config[:public_ip] == false) || (nic['type'] != 'Virtual') then
+        nic['ipaddress']
+      else
         # create ip address, ssh forwarding rule and optional forwarding rules
         ip_address = connection.associate_ip_address(server['zoneid'])
         ssh_rule = connection.create_port_forwarding_rule(ip_address['id'], "22", "TCP", "22", server['id'])
         create_port_forwarding_rules(ip_address['id'], server['id'], connection)
         ssh_rule['ipaddress']
-      else
-        # otherwise return the nic ip address
-        nic['ipaddress']
       end
     end
 
@@ -310,6 +316,3 @@ module KnifeCloudstack
 
   end # class
 end
-
-
-

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: knife-cloudstack
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Ryan Holmes
 - KC Braunschweig
+- John E. Vincent
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -38,6 +39,7 @@ description: A Knife plugin to create, list and manage CloudStack servers
 email: 
 - rholmes@edmunds.com
 - kbraunschweig@edmunds.com
+- lusis.org+github.com@gmail.com
 executables: []
 
 extensions: []
@@ -64,7 +66,7 @@ files:
 - lib/chef/knife/cs_hosts.rb
 - lib/chef/knife/cs_stack_create.rb
 - lib/chef/knife/cs_server_create.rb
-homepage: http://www.edmunds.com/
+homepage: http://cloudstack.org/
 licenses: []
 
 post_install_message: 
@@ -93,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A knife plugin for the CloudStack API