vagrant-hp 0.1.2 → 0.1.3

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.3 (Jan 17 2014)
+* Upgraded to fog 1.19.0
+* Upgraded to HP-Compute-v13.5
+
 # 0.1.2 (Oct 26 2013)
 * Upgraded to fog 1.15.0
 

data/CHANGELOG.md_

@@ -0,0 +1,13 @@
+# 0.1.3 (Jan 17 2014)
+* Upgraded to fog 1.19.0
+* Upgraded to HP-Compute-v13.5
+
+# 0.1.2 (Oct 26 2013)
+* Upgraded to fog 1.15.0
+
+# 0.1.1 (May 22, 2013)
+* Added support to specify security groups.
+
+# 0.1.0 (March 31, 2013)
+* Vagrant-Hp
+* Initial release.

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
@@ -6,5 +6,6 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mohitsethi/vagrant.git"
+  gem 'vagrant', git: 'git://github.com/mohitsethi/vagrant.git'
+  gem 'coveralls', require: false
 end

data/README.md

@@ -1,5 +1,8 @@
 # Vagrant HP Provider
 
+[![Gem Version](https://badge.fury.io/rb/vagrant-hp.png)](http://badge.fury.io/rb/vagrant-hp) [![Dependency Status](https://gemnasium.com/mohitsethi/vagrant-hp.png)](https://gemnasium.com/mohitsethi/vagrant-hp)  [![Code Climate](https://codeclimate.com/github/mohitsethi/vagrant-hp.png)](https://codeclimate.com/github/mohitsethi/vagrant-hp) [![Build Status](https://travis-ci.org/mohitsethi/vagrant-hp.png?branch=master)](https://travis-ci.org/mohitsethi/vagrant-hp) [![Coverage Status](https://coveralls.io/repos/mohitsethi/vagrant-hp/badge.png)](https://coveralls.io/r/mohitsethi/vagrant-hp)
+
+
 This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an [HP](http://www.hpcloud.com)
 provider to Vagrant, allowing Vagrant to control and provision machines on HP Cloud.
 
@@ -8,6 +11,7 @@ provider to Vagrant, allowing Vagrant to control and provision machines on HP Cl
 ## Features
 
 * Boot Servers on HP Cloud
+* Auto Floating-IP management
 * SSH into the instances.
 * Provision the instances with any built-in Vagrant provisioner.
 * Minimal synced folder support via `rsync`.
@@ -90,10 +94,10 @@ provider-specific configuration for this provider.
 This provider exposes quite a few provider-specific configuration options:
 
 * `access_key` - The access key for accessing HP Cloud
-* `image` - The Image-id  or Image-Name to boot, such as 
+* `image` - The Image-id  or Image-Name to boot, such as
     "Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)"
-* `availability_zone` - The availability zone to launch the server. 
-    If nil, it will use 'az1'.
+* `availability_zone` - The availability zone to launch the server ['us-east', 'us-west'].
+    If nil, it will use 'us-west'.
 * `flavor` - The type of flavor, such as "standard.xsmall"
 * `keypair_name` - The name of the keypair to use to bootstrap image
    which support it.

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+Rubocop::RakeTask.new
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.

data/Vagrantfile

@@ -0,0 +1,28 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "dummy"
+  config.vm.provider :hp do |rs|
+    rs.access_key  = "Y5SKH1MU6HZ2PEM9ZNZL"
+    rs.secret_key = "YA2BJr98R3hDK7IwpIkHXlDCDo9GG+GIuqhflPqQ"
+    rs.flavor   = "standard.xsmall"
+    rs.tenant_id = "87309806546461"
+    rs.server_name = "test_server"
+    #rs.image    = "Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)"
+    rs.image = "CentOS 6.3 Server 64-bit 20130116 (b)"
+    rs.keypair_name = "test_hp"
+    #rs.keypair_name = "ms"
+    rs.ssh_private_key_path = "./test_key.pem"
+    #rs.ssh_private_key_path = "~anne/.ssh/id_rsa"
+    rs.ssh_username = "root"
+    #rs.availability_zone = "az1"
+    # Security Groups defaults to ["default"]
+    # rs.security_groups = ["group1", "group2"]
+  end
+
+end

data/lib/vagrant-hp.rb

@@ -1,18 +1,17 @@
-require "pathname"
-
-require "vagrant-hp/plugin"
+require 'pathname'
+require 'vagrant-hp/plugin'
 
 module VagrantPlugins
   module HP
-    lib_path = Pathname.new(File.expand_path("../vagrant-hp", __FILE__))
-    autoload :Action, lib_path.join("action")
-    autoload :Errors, lib_path.join("errors")
+    lib_path = Pathname.new(File.expand_path('../vagrant-hp', __FILE__))
+    autoload :Action, lib_path.join('action')
+    autoload :Errors, lib_path.join('errors')
 
     # This returns the path to the source of this plugin.
     #
     # @return [Pathname]
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
 end

data/lib/vagrant-hp/action.rb

@@ -3,8 +3,8 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "pathname"
-require "vagrant/action/builder"
+require 'pathname'
+require 'vagrant/action/builder'
 
 module VagrantPlugins
   module HP
@@ -26,7 +26,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -63,7 +63,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -92,19 +92,20 @@ module VagrantPlugins
       end
 
       # The autoload farm
-      action_root = Pathname.new(File.expand_path("../action", __FILE__))
-      autoload :ConnectHP, action_root.join("connect_hp")
-      autoload :IsCreated, action_root.join("is_created")
-      autoload :MessageAlreadyCreated, action_root.join("message_already_created")
-      autoload :MessageNotCreated, action_root.join("message_not_created")
-      autoload :ReadSSHInfo, action_root.join("read_ssh_info")
-      autoload :ReadState, action_root.join("read_state")
-      autoload :RunInstance, action_root.join("run_instance")
-      autoload :SyncFolders, action_root.join("sync_folders")
-      autoload :TimedProvision, action_root.join("timed_provision")
-      autoload :WarnNetworks, action_root.join("warn_networks")
-      autoload :CreateServer, action_root.join("create_server")
-      autoload :DeleteServer, action_root.join("delete_server")
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :ConnectHP, action_root.join('connect_hp')
+      autoload :IsCreated, action_root.join('is_created')
+      autoload :MessageAlreadyCreated, action_root.join(
+                                                    'message_already_created')
+      autoload :MessageNotCreated, action_root.join('message_not_created')
+      autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :ReadState, action_root.join('read_state')
+      autoload :RunInstance, action_root.join('run_instance')
+      autoload :SyncFolders, action_root.join('sync_folders')
+      autoload :TimedProvision, action_root.join('timed_provision')
+      autoload :WarnNetworks, action_root.join('warn_networks')
+      autoload :CreateServer, action_root.join('create_server')
+      autoload :DeleteServer, action_root.join('delete_server')
     end
   end
 end

data/lib/vagrant-hp/action/connect_hp.rb

@@ -3,8 +3,8 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "fog/hp"
-require "log4r"
+require 'fog/hp'
+require 'log4r'
 
 module VagrantPlugins
   module HP
@@ -15,7 +15,7 @@ module VagrantPlugins
       class ConnectHP
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::connect_hp")
+          @logger = Log4r::Logger.new('vagrant_hp::action::connect_hp')
         end
 
         def call(env)
@@ -26,26 +26,25 @@ module VagrantPlugins
           tenant_id = config.tenant_id
           availability_zone = availability_zone(config.availability_zone)
 
-          @logger.info("Connecting to HP...")
-          env[:hp_compute] = Fog::Compute.new({
-            :provider => :hp,
-            :hp_access_key => access_key,
-            :hp_secret_key => secret_key,
-            :hp_tenant_id => tenant_id,
-            :hp_avl_zone => availability_zone,
-          })
+          @logger.info('Connecting to HP...')
+          env[:hp_compute] = Fog::Compute.new(
+            provider: 'HP',
+            version: 'v2',
+            hp_access_key: access_key,
+            hp_secret_key: secret_key,
+            hp_tenant_id: tenant_id,
+            hp_avl_zone: availability_zone,
+          )
 
           @app.call(env)
         end
 
         def availability_zone(availability_zone)
           case availability_zone
-          when 'az3'
-            return 'az-3.region-a.geo-1'
-          when 'az2'
-            return 'az-2.region-a.geo-1'
+          when 'us-east'
+            return 'region-b.geo-1'
           else
-            return 'az-1.region-a.geo-1'
+            return 'region-a.geo-1'
           end
         end
       end

data/lib/vagrant-hp/action/create_server.rb

@@ -4,8 +4,7 @@
 #
 
 require 'vagrant/util/retryable'
-require "log4r"
-
+require 'log4r'
 
 module VagrantPlugins
   module HP
@@ -16,7 +15,7 @@ module VagrantPlugins
 
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::create_server")
+          @logger = Log4r::Logger.new('vagrant_hp::action::create_server')
         end
 
         def call(env)
@@ -24,34 +23,36 @@ module VagrantPlugins
           config   = env[:machine].provider_config
 
           # Find the flavor
-          env[:ui].info(I18n.t("vagrant_hp.finding_flavor"))
+          env[:ui].info(I18n.t('vagrant_hp.finding_flavor'))
           flavor = find_match(env[:hp_compute].flavors.all, config.flavor)
-          raise Errors::NoMatchingFlavor if !flavor
+          raise Errors::NoMatchingFlavor unless flavor
 
           # Find the image
-          env[:ui].info(I18n.t("vagrant_hp.finding_image"))
+          env[:ui].info(I18n.t('vagrant_hp.finding_image'))
           image = find_match(env[:hp_compute].images, config.image)
-          raise Errors::NoMatchingImage if !image
+          raise Errors::NoMatchingImage unless image
 
           # Figure out the name for the server
-          server_name = config.server_name || env[:machine].name if env[:machine].name != "default" || get_server_name() 
+          server_name = config.server_name || env[:machine].name if \
+                          env[:machine].name != 'default' || get_server_name
 
           # Output the settings we're going to use to the user
-          env[:ui].info(I18n.t("vagrant_hp.launching_server"))
+          env[:ui].info(I18n.t('vagrant_hp.launching_server'))
           env[:ui].info(" -- Flavor: #{flavor.name}")
           env[:ui].info(" -- Image: #{image.name}")
           env[:ui].info(" -- Name: #{server_name}")
-	  if config.security_groups
+          env[:ui].info(" -- Key-name: #{config.keypair_name}")
+          if config.security_groups
             env[:ui].info(" -- Security Groups: #{config.security_groups}")
           end
 
           # Build the options for launching...
           options = {
-            :flavor_id  => flavor.id,
-            :image_id   => image.id,
-            :name        => server_name,
-            :key_name    => config.keypair_name,
-	    :security_groups => config.security_groups
+            flavor_id:       flavor.id,
+            image_id:        image.id,
+            name:            server_name,
+            key_name:        config.keypair_name,
+            security_groups: config.security_groups
           }
 
           # Create the server
@@ -61,8 +62,8 @@ module VagrantPlugins
           env[:machine].id = server.id
 
           # Wait for the server to finish building
-          env[:ui].info(I18n.t("vagrant_hp.waiting_for_build"))
-          retryable(:on => Timeout::Error, :tries => 200) do
+          env[:ui].info(I18n.t('vagrant_hp.waiting_for_build'))
+          retryable(on: Timeout::Error, tries: 200) do
             # If we're interrupted don't worry about waiting
             next if env[:interrupted]
 
@@ -72,21 +73,24 @@ module VagrantPlugins
 
             # Wait for the server to be ready
             begin
-              server.wait_for(15) { ready? }
+              server.wait_for(30) { ready? }
             rescue RuntimeError, Fog::Errors::TimeoutError => e
               # If we don't have an error about a state transition, then
               # we just move on.
-              #raise if e.message !~ /should have transitioned/
+              # raise if e.message !~ /should have transitioned/
               env[:ui].info("Error: #{e.message}")
             end
           end
-
-          if !env[:interrupted]
+          env[:ui].clear_line
+          env[:ui].info(I18n.t('vagrant_hp.associate_floating_ip_to_server'))
+          ip = env[:hp_compute].addresses.create
+          ip.server = server
+          unless env[:interrupted]
             # Clear the line one more time so the progress is removed
             env[:ui].clear_line
 
             # Wait for SSH to become available
-            env[:ui].info(I18n.t("vagrant_hp.waiting_for_ssh"))
+            env[:ui].info(I18n.t('vagrant_hp.waiting_for_ssh'))
             while true
               begin
                 # If we're interrupted then just back out
@@ -97,7 +101,7 @@ module VagrantPlugins
               sleep 2
             end
 
-            env[:ui].info(I18n.t("vagrant_hp.ready"))
+            env[:ui].info(I18n.t('vagrant_hp.ready'))
           end
 
           @app.call(env)
@@ -106,7 +110,7 @@ module VagrantPlugins
         protected
 
         # generate a random name if server_name is empty
-        def get_server_name()
+        def get_server_name
           server_name = "vagrant_hp-#{rand.to_s.split('.')[1]}"
           server_name.to_s
         end

data/lib/vagrant-hp/action/delete_server.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module HP
@@ -12,12 +12,15 @@ module VagrantPlugins
       class DeleteServer
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::delete_server")
+          @logger = Log4r::Logger.new('vagrant_hp::action::delete_server')
         end
 
         def call(env)
           if env[:machine].id
-            @logger.info(I18n.t("vagrant_hp.deleting_server"))
+            @logger.info(I18n.t('vagrant_hp.deleting_floating_ip'))
+            ip = env[:hp_compute].addresses.find { |ip| ip.instance_id==env[:machine].id }
+            ip.destroy
+            @logger.info(I18n.t('vagrant_hp.deleting_server'))
             server = env[:hp_compute].servers.get(env[:machine].id)
             server.destroy
             env[:machine].id = nil

data/lib/vagrant-hp/action/halt_server.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2013 Mohit Sethi.
 #
 
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module HP
@@ -12,12 +12,12 @@ module VagrantPlugins
       class HaltServer
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_hp::action::delete_server")
+          @logger = Log4r::Logger.new('vagrant_hp::action::delete_server')
         end
 
         def call(env)
           if env[:machine].id
-            @logger.info(I18n.t("vagrant_hp.deleting_server"))
+            @logger.info(I18n.t('vagrant_hp.deleting_server'))
             server = env[:hp_compute].servers.get(env[:machine].id)
             server.stop # verify this
             env[:machine].id = nil

data/lib/vagrant-hp/action/message_already_created.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_hp.already_created"))
+          env[:ui].info(I18n.t('vagrant_hp.already_created'))
           @app.call(env)
         end
       end

data/lib/vagrant-hp/action/message_not_created.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_hp.not_created"))
+          env[:ui].info(I18n.t('vagrant_hp.not_created'))
           @app.call(env)
         end
       end