vagrant-mcs 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ec13c0210dd8eb3f16e207e30e3c26a6693713
-  data.tar.gz: bfaae6733c2eda8736906bc229d49663b9535b25
+  metadata.gz: bfd19155ec841939dae2bfe5a0d0aa973933483a
+  data.tar.gz: ef3d78b6e99317d4529691a03225db4abfa018b1
 SHA512:
-  metadata.gz: cd33ba45b154e075bf26c1d11879cd8c0009ac38dd8bab02fd8bc7929eb6e7ee93997201bdabe3f4e8bff48f3705d722eeb5bd00986476ac644326b689207076
-  data.tar.gz: 894ab48bede3ca418d194efbeb433bfc17325d667ff5e26877499474c122681916c0678fefaa327b60693e5e24cc670c32d3f400971894e947e8c3899f2cbfd0
+  metadata.gz: f9c5dfc0657efaef5499a598c9231a359f319918b0982dbb3df2e68097e585949030860566c9a68a0dd7a31aaf118aa53ffc8ef15d38413aca91f6d25aae081e
+  data.tar.gz: 12a3793b9a97dd3648cbebf9bce945d44b8629ddd9f51022d58ea0fcb4be643307d20b2637c4b61ce6ee980edd0cb765df031622b890f6cbe07cd7b2311b238a

data/lib/vagrant-mcs/action/read_ssh_info.rb

@@ -21,6 +21,7 @@ module VagrantPlugins
           return nil if machine.id.nil?
 
           # Find the machine
+          puts "machine id: #{machine.id}"
           server = mcs.describe_instances(machine.id)
           #server = mcs.servers.get(machine.id)
           if server.nil?
@@ -46,14 +47,14 @@ module VagrantPlugins
               @logger.info("SSH host attribute not found #{attr_name}")
             end
           end
-          puts 2
+          #puts 2
 
           if !host_value
             host_value = server["ipAddresses"]
           end
-          puts server["ipAddresses"]
-          puts host_value
-          puts 3
+          #puts server["ipAddresses"]
+          #puts host_value
+          #puts 3
           return {:host => host_value, :port => 22}
         end
       end

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

@@ -13,7 +13,7 @@ module VagrantPlugins
         include Vagrant::Util::Retryable
 
         def initialize(app, env)
-          @app    = app
+          @app = app
           @logger = Log4r::Logger.new("vagrant_mcs::action::run_instance")
         end
 
@@ -25,24 +25,24 @@ module VagrantPlugins
           region = env[:machine].provider_config.region
 
           # 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
+          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_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
+          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
@@ -76,21 +76,21 @@ module VagrantPlugins
           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
+              :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
@@ -101,10 +101,7 @@ module VagrantPlugins
           begin
             # todo
             server = env[:mcs_compute].create_instance('fa1026fe-c082-4ead-8458-802bf65ca64c', 'C1_M1', nil, nil, nil, datadisk=9, bandwidth=2)
-            puts 'creating'
-            puts server
-            puts 'creating finished'
-            #server = env[:mcs_compute].servers.create(options)
+              #server = env[:mcs_compute].servers.create(options)
           rescue Exception => e
             raise Errors::FogError, :message
 =begin
@@ -149,7 +146,7 @@ module VagrantPlugins
 
               # Notify the user
               raise Errors::InstanceReadyTimeout,
-                timeout: region_config.instance_ready_timeout
+                    timeout: region_config.instance_ready_timeout
             end
           end
 
@@ -196,14 +193,14 @@ module VagrantPlugins
 
         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? # MCS default security group
-          # filter groups by name or group_id (vpc)
+          test_sec_groups = ["default"] if test_sec_groups.empty? # MCS default security group
+                    # filter groups by name or group_id (vpc)
           groups = test_sec_groups.map do |tsg|
             env[:mcs_compute].security_groups.all.select { |sg| tsg == (is_vpc ? sg.group_id : sg.name) }
           end.flatten
-          # filter TCP rules
+                    # filter TCP rules
           rules = groups.map { |sg| sg.ip_permissions.select { |r| r["ipProtocol"] == "tcp" } }.flatten
-          # test if any range includes port
+                    # test if any range includes port
           !rules.select { |r| (r["fromPort"]..r["toPort"]).include?(port) }.empty?
         end
 
@@ -236,7 +233,7 @@ module VagrantPlugins
             else
               association = env[:mcs_compute].associate_address(server.id, nil, nil, allocation.body['allocationId'])
               # Only store release data for an allocated address
-              h = { :allocation_id => allocation.body['allocationId'], :association_id => association.body['associationId'], :public_ip => allocation.body['publicIp'] }
+              h = {:allocation_id => allocation.body['allocationId'], :association_id => association.body['associationId'], :public_ip => allocation.body['publicIp']}
             end
           else
             # Standard EC2 instances only need the allocated IP address
@@ -244,7 +241,7 @@ module VagrantPlugins
               association = env[:mcs_compute].associate_address(server.id, address.public_ip)
             else
               association = env[:mcs_compute].associate_address(server.id, allocation.body['publicIp'])
-              h = { :public_ip => allocation.body['publicIp'] }
+              h = {:public_ip => allocation.body['publicIp']}
             end
           end
 
@@ -252,11 +249,11 @@ module VagrantPlugins
             @logger.debug("Could not associate Elastic IP.")
             terminate(env)
             raise Errors::FogError,
-                            :message => "Could not allocate Elastic IP."
+                  :message => "Could not allocate Elastic IP."
           end
 
           # Save this IP to the data dir so it can be released when the instance is destroyed
-          if h 
+          if h
             ip_file = env[:machine].data_dir.join('elastic_ip')
             ip_file.open('w+') do |f|
               f.write(h.to_json)
@@ -264,11 +261,11 @@ module VagrantPlugins
           end
         end
 
-        def handle_elastic_ip_error(env, message) 
+        def handle_elastic_ip_error(env, message)
           @logger.debug(message)
           terminate(env)
           raise Errors::FogError,
-                          :message => message
+                :message => message
         end
 
         def terminate(env)

data/lib/vagrant-mcs/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MCS
-    VERSION = '0.8.3'
+    VERSION = '0.8.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mcs
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - yangchangsheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -145,6 +145,7 @@ files:
 - spec/vagrant-aws/config_spec.rb
 - templates/metadata.json.erb
 - templates/vagrant-aws_package_Vagrantfile.erb
+- vagrant-mcs-0.8.4.gem
 - vagrant-mcs.gemspec
 homepage: http://www.vagrantup.com
 licenses: