knife-cloudstack-fog 0.6.0 → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9783b50b32ad22099bd01c21caa5cceca1717a28
-  data.tar.gz: e40480ac878ead9a2606bbe1e2f189d2347acc70
+  metadata.gz: e0ce7a89fa94074b99581849fae1bed30bd50e4b
+  data.tar.gz: 3b30a036cabd845e029038e553c5c2433371d164
 SHA512:
-  metadata.gz: 42e5db01915d4693be9301d05b6ec80c6d2a337526ad2af145b7366ea9bb7caf2e51bd447cd38eafe3fd95a82ac08c8069201ab7a9fcbd39754af0f38820954c
-  data.tar.gz: cf73a2525989a2dc5a16a6706f694c83f42e6d81f6a0be9d45b443ae2dd4f627513b4843c219458299ba4cf5b3677ac35c356d33f7700ad3cf1dbb6ab2feea66
+  metadata.gz: ef0d0a7c4db9d2ec8748e5b6cba75a25373731d69d60dca9523cf3706f795191a078fa1ef50cd57b7941ff2f5ed3a3913f2bed4b7ea6639c002ac8fdb0e95e7e
+  data.tar.gz: 637879d26730e410d31c218ee1549e39e689ae828bf8e131a174ead1ac68cd59b602be6303616f63e3be335e95a17548479e191016b47662ef30cff4b0107c36

data/lib/chef/knife/cloudstack_server_create.rb

@@ -158,6 +158,17 @@ class Chef
             :long => "--hypervisor HYPERVISOR",
             :description => "the hypervisor on which to deploy the virtual machine",
             :default => nil
+            
+
+      option  :secret_file,
+            :long => "--secret-file FILE",
+            :description => "the path to the file that contains the encryption key",
+            :default => nil
+
+      option  :use_primary_network,
+            :long => "--use-primary-network",
+            :description => "use the first network in networkids to connect",
+            :default => nil
 
       # def bootstrap_for_node(host, user, password)
       def bootstrap_for_node(server, ssh_host)
@@ -181,6 +192,7 @@ class Chef
         bootstrap.config[:use_sudo] = true
         bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:environment] = config[:environment]
+        bootstrap.config[:secret_file] = locate_config_value(:secret_file)
         # may be needed for vpc_mode
         bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
         begin
@@ -438,6 +450,14 @@ class Chef
           if @server['nic'].size > 0
             @primary_ip = @server['nic'].first['ipaddress']
           end
+          # if the instance has multiple interfaces, use one within first network
+          # ID specified by --networkids. this is an annoying bug in cs 2.2.x.
+          # it returns an array of NICs but the order is random.
+          if locate_config_value(:use_primary_network) != nil && ! locate_config_value(:cloudstack_networkids).empty?
+            primary_networkid = locate_config_value(:cloudstack_networkids).first
+            possible_nics = @server['nic'].select { |x| x['networkid'] == primary_networkid.to_i }
+            @primary_ip = possible_nics.first['ipaddress']
+          end
 
           if locate_config_value(:random_ssh_port) != nil
             public_ips = connection.list_public_ip_addresses("associatednetworkid" => @server['nic'][0]['networkid'])

data/lib/knife-cloudstack-fog/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloudstack
-    VERSION = "0.6.0"
+    VERSION = "0.7.0.pre"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudstack-fog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Chirag Jog (chiragjog)
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -20,20 +20,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -125,12 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cloudstack Compute Support for Chef's Knife Command