vagrant-mos 0.8.70 → 0.8.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e484a4ec0d43ecd5c56e251a5618c03788614b0
-  data.tar.gz: 2d151cfc04d65225b462f8927ba8beac2b1c5098
+  metadata.gz: 6b287a4336584152e0c6bddcf296bc36f6d317d9
+  data.tar.gz: b0b6aea44fa92729722717a28dec03bb5f381819
 SHA512:
-  metadata.gz: 85b0d1f1fdaf9bfa0208ad3c057e2945baf5c38560be54cd5f0dd3ea12bf778ec4728d9f17349cd854d0c8ee919db644d1a4d92d61de2c1b9e2955d816764a0b
-  data.tar.gz: 3db18e6147b47403f1bdc9d490f60e2b17250d2544e2580f280fb98530580a242b2bc388132f7709f6e93ab50f04b3c53e04313bf35f74b59452fefba3c211d1
+  metadata.gz: 2b032e72ff600620fbf76a4de081add51c7005dcf395794fd13677e68a89e83f0fd919104dfdf0c340b017608aca4f1a36765e58d317d2f2748507c7297f0e8a
+  data.tar.gz: 1d5cdb13888b9eeb73acae25dc4cb6c299496026c105b0d4aee240772fc42551595bb715d9e60eead0eeb1fee0e4cf1a78c5569769db5c042b932be2fa6b74a2

data/README.md

@@ -21,8 +21,7 @@ MOS.
 * SSH into the instances.
 * Provision the instances with any built-in Vagrant provisioner.
 * Minimal synced folder support via `rsync`.
-* Define region-specific configurations so Vagrant can manage machines
-  in multiple regions.  
+* Manage MOS machine's status through `vagrant status`.  
   
 ## Usage
 
@@ -48,7 +47,7 @@ manually within a `config.vm.provider` block. So first, add the
 box using any name you want:
 
 ```
-$ vagrant box add mos_box https://github.com/mitchellh/vagrant-mos/raw/master/mos.box
+$ vagrant box add mos_box https://github.com/yangcs2009/vagrant-mos/raw/master/mos.box
 ...
 ```
 

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

@@ -27,22 +27,9 @@ module VagrantPlugins
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)
           ami = region_config.ami
-          #availability_zone = region_config.availability_zone
           instance_type = region_config.instance_type
           keypair = region_config.keypair_name
-          #private_ip_address = region_config.private_ip_address
-          #security_groups = region_config.security_groups
-          #subnet_id = region_config.subnet_id
-          #tags = region_config.tags
-          #user_data = region_config.user_data
-          #block_device_mapping = region_config.block_device_mapping
-          #elastic_ip = region_config.elastic_ip
           terminate_on_shutdown = region_config.terminate_on_shutdown
-          #iam_instance_profile_arn = region_config.iam_instance_profile_arn
-          #iam_instance_profile_name = region_config.iam_instance_profile_name
-          #monitoring = region_config.monitoring
-          #ebs_optimized = region_config.ebs_optimized
-          #associate_public_ip = region_config.associate_public_ip
 
           # If there is no keypair then warn the user
           if !keypair
@@ -54,42 +41,15 @@ module VagrantPlugins
           env[:ui].info(" -- Type: #{instance_type}")
           env[:ui].info(" -- AMI: #{ami}")
           env[:ui].info(" -- Region: #{region}")
-          #env[:ui].info(" -- Availability Zone: #{availability_zone}") if availability_zone
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
-          #env[:ui].info(" -- Subnet ID: #{subnet_id}") if subnet_id
-          #env[:ui].info(" -- IAM Instance Profile ARN: #{iam_instance_profile_arn}") if iam_instance_profile_arn
-          #env[:ui].info(" -- IAM Instance Profile Name: #{iam_instance_profile_name}") if iam_instance_profile_name
-          #env[:ui].info(" -- Private IP: #{private_ip_address}") if private_ip_address
-          #env[:ui].info(" -- User Data: yes") if user_data
-          #env[:ui].info(" -- Security Groups: #{security_groups.inspect}") if !security_groups.empty?
-          #env[:ui].info(" -- User Data: #{user_data}") if user_data
-          #env[:ui].info(" -- Block Device Mapping: #{block_device_mapping}") if block_device_mapping
           env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
-          #env[:ui].info(" -- Monitoring: #{monitoring}")
-          #env[:ui].info(" -- Assigning a public IP address in a VPC: #{associate_public_ip}")
 
           options = {
-              #:availability_zone => availability_zone,
               :flavor_id => instance_type,
               :image_id => ami,
               :key_name => keypair,
-              #:private_ip_address => private_ip_address,
-              #:subnet_id => subnet_id,
-              #:iam_instance_profile_arn => iam_instance_profile_arn,
-              #:iam_instance_profile_name => iam_instance_profile_name,
-              #:tags => tags,
-              #:user_data => user_data,
-              #:block_device_mapping => block_device_mapping,
               :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
-              #:monitoring => monitoring,
-              #:ebs_optimized => ebs_optimized,
-              #:associate_public_ip => associate_public_ip
           }
-          #if !security_groups.empty?
-          #  security_group_key = options[:subnet_id].nil? ? :groups : :security_group_ids
-          #  options[security_group_key] = security_groups
-          #  env[:ui].warn(I18n.t("vagrant_mos.warn_ssh_access")) unless allows_ssh_port?(env, security_groups, subnet_id)
-          #end
 
           begin
             # create a handler to access MOS
@@ -112,7 +72,6 @@ module VagrantPlugins
                 next if env[:interrupted]
 
                 # Wait for the server to be ready
-                #server.wait_for(2, 5) { ready? }
                 if(server["status"] == "running")
                   break
                 else
@@ -164,19 +123,6 @@ module VagrantPlugins
           end
         end
 
-        #def allows_ssh_port?(env, test_sec_groups, is_vpc)
-        #  port = 22 # TODO get ssh_info port
-        #  test_sec_groups = ["default"] if test_sec_groups.empty? # MOS default security group
-        #            # filter groups by name or group_id (vpc)
-        #  groups = test_sec_groups.map do |tsg|
-        #    env[:mos_compute].security_groups.all.select { |sg| tsg == (is_vpc ? sg.group_id : sg.name) }
-        #  end.flatten
-        #            # filter TCP rules
-        #  rules = groups.map { |sg| sg.ip_permissions.select { |r| r["ipProtocol"] == "tcp" } }.flatten
-        #            # test if any range includes port
-        #  !rules.select { |r| (r["fromPort"]..r["toPort"]).include?(port) }.empty?
-        #end
-
         def terminate(env)
           destroy_env = env.dup
           destroy_env.delete(:interrupted)

data/lib/vagrant-mos/config.rb

@@ -13,22 +13,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :ami
 
-      # The availability zone to launch the instance into. If nil, it will
-      # use the default for your account.
-      #
-      # @return [String]
-      #attr_accessor :availability_zone
-
       # The timeout to wait for an instance to become ready.
       #
       # @return [Fixnum]
       attr_accessor :instance_ready_timeout
 
-      # The timeout to wait for an instance to successfully burn into an AMI.
-      #
-      # @return [Fixnum]
-      #attr_accessor :instance_package_timeout
-
       # The type of instance to launch, such as "C1_M1"
       #
       # @return [String]
@@ -39,21 +28,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :keypair_name
 
-      # The private IP address to give this machine (VPC).
-      #
-      # @return [String]
-      #attr_accessor :private_ip_address
-
       # The name of the MOS region in which to create the instance.
       #
       # @return [String]
       attr_accessor :region
 
-      # The EC2 endpoint to connect to
-      #
-      # @return [String]
-      #attr_accessor :endpoint
-
       # The version of the MOS api to use
       #
       # @return [String]
@@ -69,51 +48,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :secret_access_url
 
-
-      # The security groups to set on the instance. For VPC this must
-      # be a list of IDs. For EC2, it can be either.
-      #
-      # @return [Array<String>]
-      #attr_reader :security_groups
-
-      # The Amazon resource name (ARN) of the IAM Instance Profile
-      # to associate with the instance.
-      #
-      # @return [String]
-      #attr_accessor :iam_instance_profile_arn
-
-      # The name of the IAM Instance Profile to associate with
-      # the instance.
-      #
-      # @return [String]
-      #attr_accessor :iam_instance_profile_name
-
-      # The subnet ID to launch the machine into (VPC).
-      #
-      # @return [String]
-      #attr_accessor :subnet_id
-
-      # The tags for the machine.
-      #
-      # @return [Hash<String, String>]
-      #attr_accessor :tags
-
       # Use IAM Instance Role for authentication to MOS instead of an
       # explicit access_id and secret_access_key
       #
       # @return [Boolean]
       attr_accessor :use_iam_profile
 
-      # The user data string
-      #
-      # @return [String]
-      #attr_accessor :user_data
-
-      # Block device mappings
-      #
-      # @return [Array<Hash>]
-      #attr_accessor :block_device_mapping
-
       # Indicates whether an instance stops or terminates when you initiate shutdown from the instance
       #
       # @return [bool]
@@ -129,56 +69,19 @@ module VagrantPlugins
       # @return [Symbol]
       attr_accessor :ssh_host_attribute
 
-      # Enables Monitoring
-      #
-      # @return [Boolean]
-      #attr_accessor :monitoring
-
-      # EBS optimized instance
-      #
-      # @return [Boolean]
-      #attr_accessor :ebs_optimized
-
-      # Assigning a public IP address in a VPC
-      #
-      # @return [Boolean]
-      #attr_accessor :associate_public_ip
-
-      # The name of ELB, which an instance should be
-      # attached to
-      #
-      # @return [String]
-      #attr_accessor :elb
-
       def initialize(region_specific=false)
         @access_key_id             = UNSET_VALUE
         @ami                       = UNSET_VALUE
-        #@availability_zone         = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
-        #@instance_package_timeout  = UNSET_VALUE
         @instance_type             = UNSET_VALUE
         @keypair_name              = UNSET_VALUE
-        #@private_ip_address        = UNSET_VALUE
         @region                    = UNSET_VALUE
-        #@endpoint                  = UNSET_VALUE
         @version                   = UNSET_VALUE
         @secret_access_key         = UNSET_VALUE
         @secret_access_url         = UNSET_VALUE
-        #@security_groups           = UNSET_VALUE
-        #@subnet_id                 = UNSET_VALUE
-        #@tags                      = {}
-        #@user_data                 = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
-        #@block_device_mapping      = []
-        #@elastic_ip                = UNSET_VALUE
-        #@iam_instance_profile_arn  = UNSET_VALUE
-        #@iam_instance_profile_name = UNSET_VALUE
         @terminate_on_shutdown     = UNSET_VALUE
         @ssh_host_attribute        = UNSET_VALUE
-        #@monitoring                = UNSET_VALUE
-        #@ebs_optimized             = UNSET_VALUE
-        #@associate_public_ip       = UNSET_VALUE
-        #@elb                       = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -188,12 +91,6 @@ module VagrantPlugins
         @__region_specific = region_specific
       end
 
-      # set security_groups
-      def security_groups=(value)
-        # convert value to array if necessary
-        @security_groups = value.is_a?(Array) ? value : [value]
-      end
-
       # Allows region-specific overrides of any of the settings on this
       # configuration object. This allows the user to override things like
       # AMI and keypair name for regions. Example:
@@ -248,13 +145,6 @@ module VagrantPlugins
           # Set it
           result.instance_variable_set(:@__region_config, new_region_config)
 
-          # Merge in the tags
-          #result.tags.merge!(self.tags)
-          #result.tags.merge!(other.tags)
-
-          # Merge block_device_mapping
-          #result.block_device_mapping |= self.block_device_mapping
-          #result.block_device_mapping |= other.block_device_mapping
         end
       end
 
@@ -271,20 +161,12 @@ module VagrantPlugins
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 
-        # Set the default timeout for waiting for an instance to burn into and ami
-        #@instance_package_timeout = 600 if @instance_package_timeout == UNSET_VALUE
 
         # Default instance type is an m3.medium
         @instance_type = "C1_M2" if @instance_type == UNSET_VALUE
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE
 
-        # Default the private IP to nil since VPC is not default
-        #@private_ip_address = nil if @private_ip_address == UNSET_VALUE
-
-        # Acquire an elastic IP if requested
-        #@elastic_ip = nil if @elastic_ip == 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
@@ -292,40 +174,15 @@ module VagrantPlugins
         #@endpoint = nil if @endpoint == UNSET_VALUE
         @version = nil if @version == UNSET_VALUE
 
-        # The security groups are empty by default.
-        #@security_groups = [] if @security_groups == UNSET_VALUE
-
-        # Subnet is nil by default otherwise we'd launch into VPC.
-        #@subnet_id = nil if @subnet_id == UNSET_VALUE
-
-        # IAM Instance profile arn/name is nil by default.
-        #@iam_instance_profile_arn   = nil if @iam_instance_profile_arn  == UNSET_VALUE
-        #@iam_instance_profile_name  = nil if @iam_instance_profile_name == UNSET_VALUE
-
         # By default we don't use an IAM profile
         @use_iam_profile = false if @use_iam_profile == UNSET_VALUE
 
-        # User Data is nil by default
-        #@user_data = nil if @user_data == UNSET_VALUE
-
         # default false
         @terminate_on_shutdown = false if @terminate_on_shutdown == UNSET_VALUE
 
         # default to nil
         @ssh_host_attribute = nil if @ssh_host_attribute == UNSET_VALUE
 
-        # default false
-        #@monitoring = false if @monitoring == UNSET_VALUE
-
-        # default false
-        #@ebs_optimized = false if @ebs_optimized == UNSET_VALUE
-
-        # default false
-        #@associate_public_ip = false if @associate_public_ip == UNSET_VALUE
-
-        # Don't attach instance to any ELB by default
-        #@elb = nil if @elb == UNSET_VALUE
-
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.
         if !@__region_specific
@@ -370,10 +227,6 @@ module VagrantPlugins
               config.secret_access_url.nil?
           end
 
-          #if config.associate_public_ip && !config.subnet_id
-          #  errors << I18n.t("vagrant_mos.config.subnet_id_required_with_public_ip")
-          #end
-
           errors << I18n.interpolate("vagrant_mos.config.ami_required", :region => @region)  if config.ami.nil?
         end
 

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.70'
+    VERSION = '0.8.80'
   end
 end

data/locales/en.yml

@@ -2,36 +2,14 @@ en:
   vagrant_mos:
     already_status: |-
       The machine is already %{status}.
-#    burning_ami: |-
-#      Waiting for the AMI '%{ami_id}' to burn...
-#    elb:
-#      adjusting: |-
-#        Adjusting availability zones of ELB %{elb_name}...
-#      registering: |-
-#        Registering %{instance_id} at ELB %{elb_name}...
-#      deregistering: |-
-#        Deregistering %{instance_id} from ELB %{elb_name}...
-#      ok: |-
-#        ok
-#      skipped: |-
-#        skipped
 
     launching_instance: |-
       Launching an instance with the following settings...
     launch_no_keypair: |-
       Warning! You didn't specify a keypair to launch your instance with.
       This can sometimes result in not being able to access your instance.
-#    launch_vpc_warning: |-
-#      Warning! You're launching this instance into a VPC without an
-#      elastic IP. Please verify you're properly connected to a VPN so
-#      you can access this machine, otherwise Vagrant will not be able
-#      to SSH into it.
     not_created: |-
       Instance is not created. Please run `vagrant up` first.
-#    packaging_instance: |-
-#      Burning instance %{instance_id} into an ami
-#    packaging_instance_complete: |-
-#      Burn was successful in %{time_seconds}s
     ready: |-
       Machine is booted and ready for use!
     rsync_not_found_warning: |-
@@ -73,8 +51,6 @@ en:
         A secret access key is required via "secret_access_key"
       secret_access_url_required: |-
         A secret access url is required via "secret_access_url"
-#      subnet_id_required_with_public_ip: |-
-#        If you assign a public IP address to an instance in a VPC, a subnet must be specifed via "subnet_id"
 
     errors:
       mos_error: |-
@@ -93,17 +69,6 @@ en:
         set waiting for the instance to become ready is %{timeout} seconds.
         Please verify that the machine properly boots. If you need more time
         set the `instance_ready_timeout` configuration on the MOS provider.
-#      instance_package_error: |-
-#        There was an error packaging the instance. See details below for more info.
-#
-#        AMI Id: %{ami_id}
-#        Error: %{err}
-#      instance_package_timeout: |-
-#        The AMI failed to become "ready" in MOS. The timeout currently
-#        set waiting for the instance to become ready is %{timeout} seconds. For
-#        larger instances AMI burning may take long periods of time. Please
-#        ensure the timeout is set high enough, it can be changed by adjusting
-#        the `instance_package_timeout` configuration on the MOS provider.
       rsync_error: |-
         There was an error when attempting to rsync a shared folder.
         Please inspect the error message below for more info.
@@ -117,8 +82,6 @@ en:
 
         Host path: %{hostpath}
         Error: %{err}
-#      elb_does_not_exist: |-
-#        ELB configured for the instance does not exist
 
     states:
       short_not_created: |-

data/spec/vagrant-mos/config_spec.rb

@@ -17,29 +17,15 @@ describe VagrantPlugins::MOS::Config do
 
     its("access_key_id")     { should be_nil }
     its("ami")               { should be_nil }
-    #its("availability_zone") { should be_nil }
     its("instance_ready_timeout") { should == 120 }
-    #its("instance_package_timeout") { should == 600 }
     its("instance_type")     { should == "C1_M2" }
     its("keypair_name")      { should be_nil }
-    #its("private_ip_address") { should be_nil }
     its("region")            { should == "us-east-1" }
     its("secret_access_key") { 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 }
-    #its("iam_instance_profile_name") { should be_nil }
-    #its("tags")              { should == {} }
-    #its("user_data")         { should be_nil }
     its("use_iam_profile")   { should be_false }
-    #its("block_device_mapping")  {should == [] }
-    #its("elastic_ip")        { should be_nil }
     its("terminate_on_shutdown") { should == false }
     its("ssh_host_attribute") { should be_nil }
-    #its("monitoring")        { should == false }
-    #its("ebs_optimized")     { should == false }
-    #its("associate_public_ip")     { should == false }
   end
 
   describe "overriding defaults" do
@@ -203,21 +189,6 @@ describe VagrantPlugins::MOS::Config do
     describe "merging" do
       let(:first)  { described_class.new }
       let(:second) { described_class.new }
-
-      #it "should merge the tags and block_device_mappings" do
-      #  first.tags["one"] = "one"
-      #  second.tags["two"] = "two"
-      #  first.block_device_mapping = [{:one => "one"}]
-      #  second.block_device_mapping = [{:two => "two"}]
-      #
-      #  third = first.merge(second)
-      #  third.tags.should == {
-      #    "one" => "one",
-      #    "two" => "two"
-      #  }
-      #  third.block_device_mapping.index({:one => "one"}).should_not be_nil
-      #  third.block_device_mapping.index({:two => "two"}).should_not be_nil
-      #end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.70
+  version: 0.8.80
 platform: ruby
 authors:
 - yangcs2009
@@ -139,6 +139,7 @@ files:
 - spec/vagrant-mos/config_spec.rb
 - templates/metadata.json.erb
 - templates/vagrant-aws_package_Vagrantfile.erb
+- vagrant-mos-0.8.70.gem
 - vagrant-mos.gemspec
 homepage: http://www.vagrantup.com
 licenses: