vagrant-mos 0.8.40 → 0.8.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e38e4955ab94f5e0ecb0b51b44c2fbc3437487
-  data.tar.gz: 836c2b90ec9d3a107085a5a61bcafd8bc0631176
+  metadata.gz: 4497a2cda0990ef789b172f33a08c462cfb0b1c0
+  data.tar.gz: 53af4e9ca4113e9605f3ca76d8b924879204308e
 SHA512:
-  metadata.gz: c6b17d9d13e8f846458b8d1b40dbcca4284ab43842fe376fd1356ec092499915fe0b1084428c162d7b3a315d3a77e9c760f2b860a9285dd552e3cc074c0023b6
-  data.tar.gz: e0d15b5a1867d80830c95525b74947d65c6069bb6861664e8534622de47711a46f45231b1f92c05f239443bbc397b7ad350e0b6f63a7d6070e152558686e6db1
+  metadata.gz: 00fc8f6c5960ec23f224cf14af009bf1a65fa1121b54aa58a1ac365f86691d38420abfae8c5d1feeb2965034a1314c29605176f9ba793dc360fd34102f966bf4
+  data.tar.gz: 5143cef1c7be8d06dedd99305291e52a5bd48c4fb044da3a40b1d33f3dad887ac010147b8e1b6d3f0fb0458f232870ae3cdc12394ca1a7d318b77d0d62884148

data/Gemfile

@@ -7,6 +7,6 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
-  gem 'mos_sdk'
+  gem 'mos-sdk'
   gem 'crack', '~> 0.4.2'
 end

data/README.md

@@ -58,12 +58,12 @@ your information where necessary.
 
 ```
 Vagrant.configure("2") do |config|
-  config.vm.box = "dummy"
+  config.vm.box = "mos_box"
 
   config.vm.provider :mos do |mos, override|
     mos.access_key_id = "YOUR KEY"
     mos.secret_access_key = "YOUR SECRET KEY"
-    mos.session_token = "SESSION TOKEN"
+    mos.secret_access_url = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
 
     mos.ami = "ami-7747d01e"
@@ -116,12 +116,9 @@ This provider exposes quite a few provider-specific configuration options:
   type to support both paravirtualization and hvm AMIs
 * `keypair_name` - The name of the keypair to use to bootstrap AMIs
    which support it.
-* `session_token` - The session token provided by STS
+* `secret_access_url` - The accee url for accessing MOS
 * `private_ip_address` - The private IP address to assign to an instance
   within a [VPC](http://mos.amazon.com/vpc/)
-* `elastic_ip` - Can be set to 'true', or to an existing Elastic IP address. 
-  If true, allocate a new Elastic IP address to the instance. If set
-  to an existing Elastic IP address, assign the address to the instance.
 * `region` - The region to start the instance in, such as "us-east-1"
 * `secret_access_key` - The secret access key for accessing MOS
 * `security_groups` - An array of security groups for the instance. If this

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

@@ -1,5 +1,5 @@
 require "fog"
-require "mos_sdk"
+require "mos-sdk"
 require "log4r"
 
 module VagrantPlugins
@@ -32,7 +32,6 @@ module VagrantPlugins
             fog_config[:mos_access_key_id] = region_config.access_key_id
             fog_config[:mos_secret_access_key] = region_config.secret_access_key
             fog_config[:mos_secret_url] = region_config.secret_access_url
-            #fog_config[:mos_session_token] = region_config.session_token
           end
 
           fog_config[:endpoint] = region_config.endpoint if region_config.endpoint
@@ -40,7 +39,7 @@ module VagrantPlugins
 
           @logger.info("Connecting to MOS...")
           #env[:mos_compute] = Fog::Compute.new(fog_config)
-          env[:mos_compute] = MosSdk::Client.new(region_config.access_key_id, region_config.secret_access_key, region_config.secret_access_url)
+          env[:mos_compute] = MOS::Client.new(region_config.access_key_id, region_config.secret_access_key, region_config.secret_access_url)
           # env[:mos_elb]     = Fog::MOS::ELB.new(fog_config.except(:provider, :endpoint))
 
           @app.call(env)

data/lib/vagrant-mos/action.rb

@@ -51,7 +51,6 @@ module VagrantPlugins
                   next
                 end
                 b3.use ConnectMOS
-                b3.use ElbDeregisterInstance
                 b3.use TerminateInstance
                 b3.use ProvisionerCleanup if defined?(ProvisionerCleanup)
               end
@@ -205,8 +204,6 @@ module VagrantPlugins
       autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
       autoload :WaitForState, action_root.join("wait_for_state")
       autoload :WarnNetworks, action_root.join("warn_networks")
-      autoload :ElbRegisterInstance, action_root.join("elb_register_instance")
-      autoload :ElbDeregisterInstance, action_root.join("elb_deregister_instance")
     end
   end
 end

data/lib/vagrant-mos/config.rb

@@ -44,12 +44,6 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :private_ip_address
 
-      # If true, acquire and attach an elastic IP address.
-      # If set to an IP address, assign to the instance.
-      #
-      # @return [String]
-      attr_accessor :elastic_ip
-
       # The name of the MOS region in which to create the instance.
       #
       # @return [String]
@@ -75,10 +69,6 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :secret_access_url
 
-      # The token associated with the key for accessing MOS.
-      #
-      # @return [String]
-      attr_accessor :session_token
 
       # The security groups to set on the instance. For VPC this must
       # be a list of IDs. For EC2, it can be either.
@@ -174,7 +164,6 @@ module VagrantPlugins
         @version                   = UNSET_VALUE
         @secret_access_key         = UNSET_VALUE
         @secret_access_url         = UNSET_VALUE
-        @session_token             = UNSET_VALUE
         @security_groups           = UNSET_VALUE
         @subnet_id                 = UNSET_VALUE
         @tags                      = {}
@@ -274,7 +263,7 @@ module VagrantPlugins
         # will default to nil if the environment variables are not present.
         @access_key_id     = ENV['MOS_ACCESS_KEY'] if @access_key_id     == UNSET_VALUE
         @secret_access_key = ENV['MOS_SECRET_KEY'] if @secret_access_key == UNSET_VALUE
-        @session_token     = ENV['MOS_SESSION_TOKEN'] if @session_token == UNSET_VALUE
+        @secret_access_url = ENV['MOS_SECRET_URL'] if @secret_access_url == UNSET_VALUE
 
         # AMI must be nil, since we can't default that
         @ami = nil if @ami == UNSET_VALUE
@@ -286,7 +275,6 @@ module VagrantPlugins
         @instance_package_timeout = 600 if @instance_package_timeout == UNSET_VALUE
 
         # Default instance type is an m3.medium
-        #@instance_type = "m3.medium" if @instance_type == UNSET_VALUE
         @instance_type = "C1_M2" if @instance_type == UNSET_VALUE
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.40'
+    VERSION = '0.8.41'
   end
 end

data/spec/vagrant-mos/config_spec.rb

@@ -25,7 +25,7 @@ describe VagrantPlugins::MOS::Config do
     its("private_ip_address") { should be_nil }
     its("region")            { should == "us-east-1" }
     its("secret_access_key") { should be_nil }
-    its("session_token") { should be_nil }
+    its("secret_access_url") { should be_nil }
     its("security_groups")   { should == [] }
     its("subnet_id")         { should be_nil }
     its("iam_instance_profile_arn") { should be_nil }
@@ -49,8 +49,8 @@ describe VagrantPlugins::MOS::Config do
     # and asserts the proper result comes back out.
     [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
       :instance_package_timeout, :instance_type, :keypair_name, :ssh_host_attribute,
-      :ebs_optimized, :region, :secret_access_key, :session_token, :monitoring,
-      :associate_public_ip, :subnet_id, :tags, :elastic_ip, :terminate_on_shutdown,
+      :ebs_optimized, :region, :secret_access_key, :secret_access_url, :monitoring,
+      :associate_public_ip, :subnet_id, :tags, :terminate_on_shutdown,
       :iam_instance_profile_arn, :iam_instance_profile_name,
       :use_iam_profile, :user_data, :block_device_mapping].each do |attribute|
 
@@ -77,14 +77,14 @@ describe VagrantPlugins::MOS::Config do
 
       its("access_key_id")     { should be_nil }
       its("secret_access_key") { should be_nil }
-      its("session_token")     { should be_nil }
+      its("secret_access_url")     { should be_nil }
     end
 
-    context "with EC2 credential environment variables" do
+    context "with MOS credential environment variables" do
       before :each do
         ENV.stub(:[]).with("MOS_ACCESS_KEY").and_return("access_key")
         ENV.stub(:[]).with("MOS_SECRET_KEY").and_return("secret_key")
-        ENV.stub(:[]).with("MOS_SESSION_TOKEN").and_return("session_token")
+        ENV.stub(:[]).with("MOS_SECRET_URL").and_return("secret_url")
       end
 
       subject do
@@ -95,7 +95,7 @@ describe VagrantPlugins::MOS::Config do
 
       its("access_key_id")     { should == "access_key" }
       its("secret_access_key") { should == "secret_key" }
-      its("session_token")     { should == "session_token" }
+      its("secret_access_url")     { should == "secret_url" }
     end
   end
 
@@ -106,7 +106,7 @@ describe VagrantPlugins::MOS::Config do
     let(:config_keypair_name)      { "foo" }
     let(:config_region)            { "foo" }
     let(:config_secret_access_key) { "foo" }
-    let(:config_session_token)     { "foo" }
+    let(:config_secret_access_url)     { "foo" }
 
     def set_test_values(instance)
       instance.access_key_id     = config_access_key_id
@@ -115,7 +115,7 @@ describe VagrantPlugins::MOS::Config do
       instance.keypair_name      = config_keypair_name
       instance.region            = config_region
       instance.secret_access_key = config_secret_access_key
-      instance.session_token     = config_session_token
+      instance.secret_access_url     = config_secret_access_url
     end
 
     it "should raise an exception if not finalized" do
@@ -141,7 +141,7 @@ describe VagrantPlugins::MOS::Config do
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == config_region }
       its("secret_access_key") { should == config_secret_access_key }
-      its("session_token")     { should == config_session_token }
+      its("secret_access_url") { should == config_secret_access_url }
     end
 
     context "with a specific config set" do
@@ -166,7 +166,7 @@ describe VagrantPlugins::MOS::Config do
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == region_name }
       its("secret_access_key") { should == config_secret_access_key }
-      its("session_token")     { should == config_session_token }
+      its("secret_access_url") { should == config_secret_access_url }
     end
 
     describe "inheritance of parent config" do

data/vagrant-mos.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant-mos"
 
   s.add_runtime_dependency "fog", "~> 1.22"
-  s.add_runtime_dependency "mos_sdk", ">= 1.0.0"
+  s.add_runtime_dependency "mos-sdk", ">= 1.0.0"
 
   s.add_runtime_dependency "crack", "~> 0.4.2"
   s.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.40
+  version: 0.8.41
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.22'
 - !ruby/object:Gem::Dependency
-  name: mos_sdk
+  name: mos-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='