vagrant-mos 0.8.54 → 0.8.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/vagrant-mos/action.rb +15 -15
- data/lib/vagrant-mos/config.rb +4 -4
- data/lib/vagrant-mos/errors.rb +6 -6
- data/lib/vagrant-mos/version.rb +1 -1
- data/locales/en.yml +11 -11
- data/spec/vagrant-mos/config_spec.rb +3 -3
- metadata +1 -1
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA1:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: 03392ab5950364e6851c0c6dcc6ed84182672027
         | 
| 4 | 
            +
              data.tar.gz: c53e4bb8d3344eb76a2287a5376b0b3a40135bfc
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: e825cd5b4f988b12dbb5c5756a963286f1bcff68ccd42be8474b53e4771d5bddbc405a7df49955dce1ca97be8b909c515991c7d6d4bff52fb111fe53a6452577
         | 
| 7 | 
            +
              data.tar.gz: 54cc1652279f7f147666b995170de56baa344a9cbc56b831cc0c48d78a4e6c8092884e774cb95edf8a3f50ab8031549d23950e320a758832627811d830fa3523
         | 
    
        data/lib/vagrant-mos/action.rb
    CHANGED
    
    | @@ -8,20 +8,20 @@ module VagrantPlugins | |
| 8 8 | 
             
                  # Include the built-in modules so we can use them as top-level things.
         | 
| 9 9 | 
             
                  include Vagrant::Action::Builtin
         | 
| 10 10 |  | 
| 11 | 
            -
                  def self.action_package
         | 
| 12 | 
            -
             | 
| 13 | 
            -
             | 
| 14 | 
            -
             | 
| 15 | 
            -
             | 
| 16 | 
            -
             | 
| 17 | 
            -
             | 
| 18 | 
            -
             | 
| 19 | 
            -
             | 
| 20 | 
            -
             | 
| 21 | 
            -
             | 
| 22 | 
            -
             | 
| 23 | 
            -
             | 
| 24 | 
            -
                  end
         | 
| 11 | 
            +
                  #def self.action_package
         | 
| 12 | 
            +
                  #  Vagrant::Action::Builder.new.tap do |b|
         | 
| 13 | 
            +
                  #    b.use Call, IsCreated do |env, b2|
         | 
| 14 | 
            +
                  #      if !env[:result]
         | 
| 15 | 
            +
                  #        b2.use MessageNotCreated
         | 
| 16 | 
            +
                  #        next
         | 
| 17 | 
            +
                  #      end
         | 
| 18 | 
            +
                  #
         | 
| 19 | 
            +
                  #      # Connect to MOS and then Create a package from the server instance
         | 
| 20 | 
            +
                  #      b2.use ConnectMOS
         | 
| 21 | 
            +
                  #      b2.use PackageInstance
         | 
| 22 | 
            +
                  #    end
         | 
| 23 | 
            +
                  #  end
         | 
| 24 | 
            +
                  #end
         | 
| 25 25 |  | 
| 26 26 | 
             
                  # This action is called to halt the remote machine.
         | 
| 27 27 | 
             
                  def self.action_halt
         | 
| @@ -194,7 +194,7 @@ module VagrantPlugins | |
| 194 194 | 
             
                  autoload :MessageAlreadyCreated, action_root.join("message_already_created")
         | 
| 195 195 | 
             
                  autoload :MessageNotCreated, action_root.join("message_not_created")
         | 
| 196 196 | 
             
                  autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
         | 
| 197 | 
            -
                  autoload :PackageInstance, action_root.join("package_instance")
         | 
| 197 | 
            +
                  #autoload :PackageInstance, action_root.join("package_instance")
         | 
| 198 198 | 
             
                  autoload :ReadSSHInfo, action_root.join("read_ssh_info")
         | 
| 199 199 | 
             
                  autoload :ReadState, action_root.join("read_state")
         | 
| 200 200 | 
             
                  autoload :RunInstance, action_root.join("run_instance")
         | 
    
        data/lib/vagrant-mos/config.rb
    CHANGED
    
    | @@ -27,9 +27,9 @@ module VagrantPlugins | |
| 27 27 | 
             
                  # The timeout to wait for an instance to successfully burn into an AMI.
         | 
| 28 28 | 
             
                  #
         | 
| 29 29 | 
             
                  # @return [Fixnum]
         | 
| 30 | 
            -
                  attr_accessor :instance_package_timeout
         | 
| 30 | 
            +
                  #attr_accessor :instance_package_timeout
         | 
| 31 31 |  | 
| 32 | 
            -
                  # The type of instance to launch, such as " | 
| 32 | 
            +
                  # The type of instance to launch, such as "C1_M1"
         | 
| 33 33 | 
             
                  #
         | 
| 34 34 | 
             
                  # @return [String]
         | 
| 35 35 | 
             
                  attr_accessor :instance_type
         | 
| @@ -155,7 +155,7 @@ module VagrantPlugins | |
| 155 155 | 
             
                    @ami                       = UNSET_VALUE
         | 
| 156 156 | 
             
                    @availability_zone         = UNSET_VALUE
         | 
| 157 157 | 
             
                    @instance_ready_timeout    = UNSET_VALUE
         | 
| 158 | 
            -
                     | 
| 158 | 
            +
                    #@instance_package_timeout  = UNSET_VALUE
         | 
| 159 159 | 
             
                    @instance_type             = UNSET_VALUE
         | 
| 160 160 | 
             
                    @keypair_name              = UNSET_VALUE
         | 
| 161 161 | 
             
                    @private_ip_address        = UNSET_VALUE
         | 
| @@ -272,7 +272,7 @@ module VagrantPlugins | |
| 272 272 | 
             
                    @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
         | 
| 273 273 |  | 
| 274 274 | 
             
                    # Set the default timeout for waiting for an instance to burn into and ami
         | 
| 275 | 
            -
                     | 
| 275 | 
            +
                    #@instance_package_timeout = 600 if @instance_package_timeout == UNSET_VALUE
         | 
| 276 276 |  | 
| 277 277 | 
             
                    # Default instance type is an m3.medium
         | 
| 278 278 | 
             
                    @instance_type = "C1_M2" if @instance_type == UNSET_VALUE
         | 
    
        data/lib/vagrant-mos/errors.rb
    CHANGED
    
    | @@ -19,13 +19,13 @@ module VagrantPlugins | |
| 19 19 | 
             
                    error_key(:instance_ready_timeout)
         | 
| 20 20 | 
             
                  end
         | 
| 21 21 |  | 
| 22 | 
            -
                  class InstancePackageError < VagrantMOSError
         | 
| 23 | 
            -
             | 
| 24 | 
            -
                  end
         | 
| 22 | 
            +
                  #class InstancePackageError < VagrantMOSError
         | 
| 23 | 
            +
                  #  error_key(:instance_package_error)
         | 
| 24 | 
            +
                  #end
         | 
| 25 25 |  | 
| 26 | 
            -
                  class InstancePackageTimeout < VagrantMOSError
         | 
| 27 | 
            -
             | 
| 28 | 
            -
                  end
         | 
| 26 | 
            +
                  #class InstancePackageTimeout < VagrantMOSError
         | 
| 27 | 
            +
                  #  error_key(:instance_package_timeout)
         | 
| 28 | 
            +
                  #end
         | 
| 29 29 |  | 
| 30 30 | 
             
                  class RsyncError < VagrantMOSError
         | 
| 31 31 | 
             
                    error_key(:rsync_error)
         | 
    
        data/lib/vagrant-mos/version.rb
    CHANGED
    
    
    
        data/locales/en.yml
    CHANGED
    
    | @@ -91,17 +91,17 @@ en: | |
| 91 91 | 
             
                    set waiting for the instance to become ready is %{timeout} seconds.
         | 
| 92 92 | 
             
                    Please verify that the machine properly boots. If you need more time
         | 
| 93 93 | 
             
                    set the `instance_ready_timeout` configuration on the MOS provider.
         | 
| 94 | 
            -
                  instance_package_error: |-
         | 
| 95 | 
            -
                    There was an error packaging the instance. See details below for more info.
         | 
| 96 | 
            -
             | 
| 97 | 
            -
                    AMI Id: %{ami_id}
         | 
| 98 | 
            -
                    Error: %{err}
         | 
| 99 | 
            -
                  instance_package_timeout: |-
         | 
| 100 | 
            -
                    The AMI failed to become "ready" in MOS. The timeout currently
         | 
| 101 | 
            -
                    set waiting for the instance to become ready is %{timeout} seconds. For | 
| 102 | 
            -
                    larger instances AMI burning may take long periods of time. Please
         | 
| 103 | 
            -
                    ensure the timeout is set high enough, it can be changed by adjusting
         | 
| 104 | 
            -
                    the `instance_package_timeout` configuration on the MOS provider.
         | 
| 94 | 
            +
            #      instance_package_error: |-
         | 
| 95 | 
            +
            #        There was an error packaging the instance. See details below for more info.
         | 
| 96 | 
            +
            #
         | 
| 97 | 
            +
            #        AMI Id: %{ami_id}
         | 
| 98 | 
            +
            #        Error: %{err}
         | 
| 99 | 
            +
            #      instance_package_timeout: |-
         | 
| 100 | 
            +
            #        The AMI failed to become "ready" in MOS. The timeout currently
         | 
| 101 | 
            +
            #        set waiting for the instance to become ready is %{timeout} seconds. For
         | 
| 102 | 
            +
            #        larger instances AMI burning may take long periods of time. Please
         | 
| 103 | 
            +
            #        ensure the timeout is set high enough, it can be changed by adjusting
         | 
| 104 | 
            +
            #        the `instance_package_timeout` configuration on the MOS provider.
         | 
| 105 105 | 
             
                  rsync_error: |-
         | 
| 106 106 | 
             
                    There was an error when attempting to rsync a shared folder.
         | 
| 107 107 | 
             
                    Please inspect the error message below for more info.
         | 
| @@ -19,8 +19,8 @@ describe VagrantPlugins::MOS::Config do | |
| 19 19 | 
             
                its("ami")               { should be_nil }
         | 
| 20 20 | 
             
                its("availability_zone") { should be_nil }
         | 
| 21 21 | 
             
                its("instance_ready_timeout") { should == 120 }
         | 
| 22 | 
            -
                its("instance_package_timeout") { should == 600 }
         | 
| 23 | 
            -
                its("instance_type")     { should == " | 
| 22 | 
            +
                #its("instance_package_timeout") { should == 600 }
         | 
| 23 | 
            +
                its("instance_type")     { should == "C1_M2" }
         | 
| 24 24 | 
             
                its("keypair_name")      { should be_nil }
         | 
| 25 25 | 
             
                its("private_ip_address") { should be_nil }
         | 
| 26 26 | 
             
                its("region")            { should == "us-east-1" }
         | 
| @@ -48,7 +48,7 @@ describe VagrantPlugins::MOS::Config do | |
| 48 48 | 
             
                # each of these attributes to "foo" in isolation, and reads the value
         | 
| 49 49 | 
             
                # and asserts the proper result comes back out.
         | 
| 50 50 | 
             
                [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
         | 
| 51 | 
            -
                  : | 
| 51 | 
            +
                  :instance_type, :keypair_name, :ssh_host_attribute,
         | 
| 52 52 | 
             
                  :region, :secret_access_key, :secret_access_url, :monitoring,
         | 
| 53 53 | 
             
                  :associate_public_ip, :subnet_id, :tags, :terminate_on_shutdown,
         | 
| 54 54 | 
             
                  :iam_instance_profile_arn, :iam_instance_profile_name,
         |