vagrant-mos 0.9.60 → 0.9.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea15fc894b57e3f82b15d2e5d93e27c104a4ba39
-  data.tar.gz: 42100dd56da439229b5e56400fe7557206691315
+  metadata.gz: 57f26e0d6c8bb0e5326e6a8a29976f8084484f42
+  data.tar.gz: 0ba9f5177ee5de179501c296049ea424568bbff1
 SHA512:
-  metadata.gz: fa44e3f6c9fc8ca6125facd794f7d125c8b7ecdd001dfe9faeec81aa97dc28dabdb33eb7367378fb9a1cf555049134f8ad96143c4d19f53e0f517736f076b408
-  data.tar.gz: e7197d5141effd518d721aad932dc5dd266739e3081bd8122b4e62107775c6ccd381bd3850f93dcfb5251eeb033a9bfb31a5e4295925960106796f85263c3a9f
+  metadata.gz: 7f8d5808f2bee4398224bc9d3699d650729648b29ba2deef430caaa067290d4ba1fcbca652a78b4fa9b673ab258aa2a4b5f16f130172b82cbbf484ff85854af7
+  data.tar.gz: 34ac36726de66daf861abccb04697f494b7d3b697060abe35c379004ee6291c1204bda75333c220546623f2402a3ff85f89dc8b57773b15f2ad641bff420b8ae

data/lib/vagrant-mos/action/run_instance.rb

@@ -32,6 +32,8 @@ module VagrantPlugins
           name = region_config.name
           instance_type = region_config.instance_type
           keypair = region_config.keypair_name
+          secgroup = region_config.secgroup
+          zone = region_config.zone
 
           # If there is no keypair then warn the user
           if !keypair
@@ -46,6 +48,8 @@ module VagrantPlugins
           env[:ui].info(" -- Data_disk: #{data_disk}")
           env[:ui].info(" -- Band_width: #{band_width}")
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
+          env[:ui].info(" -- Keypair: #{secgroup}") if secgroup
+          env[:ui].info(" -- Keypair: #{zone}") if zone
 
           options = {
               :flavor_id => instance_type,
@@ -54,11 +58,15 @@ module VagrantPlugins
               :data_disk => data_disk,
               :band_width => band_width,
               :key_name => keypair,
+              :secgroup => secgroup,
+              :zone => zone,
           }
 
           begin
             # create a handler to access MOS
-            server = env[:mos_compute].create_instance(options[:template_id], options[:flavor_id], nil, options[:name], options[:key_name], options[:data_disk], options[:band_width])
+            server = env[:mos_compute].create_instance(options[:template_id], options[:flavor_id], nil, options[:name],
+                                                       options[:key_name], options[:secgroup], options[:data_disk],
+                                                       options[:band_width], options[:zone])
           rescue Exception => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/config.rb

@@ -48,6 +48,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :keypair_name
 
+      # The name of the secgroup to use.
+      #
+      # @return [String]
+      attr_accessor :secgroup
+
+      # The name of the zone to use.
+      #
+      # @return [String]
+      attr_accessor :zone
+
       # The name of the MOS region in which to create the instance.
       #
       # @return [String]
@@ -94,6 +104,8 @@ module VagrantPlugins
         @name                      = UNSET_VALUE
         @instance_type             = UNSET_VALUE
         @keypair_name              = UNSET_VALUE
+        @secgroup                  = UNSET_VALUE
+        @zone                      = UNSET_VALUE
         @region                    = UNSET_VALUE
         @version                   = UNSET_VALUE
         @access_secret             = UNSET_VALUE
@@ -195,6 +207,12 @@ module VagrantPlugins
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE
 
+        # set default secgroup
+        @secgroup = nil if @secgroup == UNSET_VALUE
+
+        # set default zone
+        @zone = nil if @zone ==  UNSET_VALUE
+
         # Default region is us-east-1. This is sensible because MOS
         # generally defaults to this as well.
         @region = "us-east-1" if @region == UNSET_VALUE

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.60'
+    VERSION = '0.9.61'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.9.60
+  version: 0.9.61
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mos-sdk