rubber 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88f8b7ebbb362ef4175a4ec9616e163df8a7fe9
-  data.tar.gz: 28873faec8931af6cec6f5308ac7e273c9f2f3da
+  metadata.gz: 579d8f1db604445157373a012bc91dd34662bad6
+  data.tar.gz: 7ae18cf0acbda8bfb970fcf194e836e11a7a3fc4
 SHA512:
-  metadata.gz: fe2c83a8626059aaf8dd0a8ac3cd88fbc82e87a127294ead52c946bbae68a85de359bd7c69f81d0504d5ed23e44ce0f3358e5c049fbef224772e41d68f7fcaf4
-  data.tar.gz: 912cb64154262793447754ea1465400557d58ed8272aa4e88b28021bd0cfc6f49c1c7c736d3819da54a3d3798588d5f78e675a7faf86449567bde593df3d8095
+  metadata.gz: 2b911de20673d642b3fa5a8b517bec8cdd4cdc062a0064300180146f231498420a036f6b02f44f1ac454079c0c42a735a318b62c7eac2c1222c8b3b14f3a8ba2
+  data.tar.gz: bd4442cb10507123a35751a44a9bad30aa938d05c748a61bf9ada7df13c8da42a46d43da107e0d6e82297388456228541e7b1e74b342556b36e7a920406ffd12

data/CHANGELOG

@@ -1,3 +1,18 @@
+3.2.2 (04/13/2016)
+
+Improvements:
+============
+
+[core] Default VPC configuration can now be defined at the cloud_provider level. <1f41e31>
+
+Bug Fixes:
+=========
+
+[core] setup_volumes no longer fails for mount points prefixed with "/mnt" (e.g.: "/mnt2", "/mnt3", etc.) <bd3fbbd>
+[core] DNS entries are no longer created for instances with no external ip. <87a2501>
+[core] Additional/custom EBS volumes now work for VPC instances with no external ip. <7b62443>
+
+
 3.2.1 (02/07/2016)
 
 Improvements:

data/lib/rubber/cloud/aws/vpc.rb

@@ -16,13 +16,21 @@ module Rubber
         # Remember that instance.network is our more generic term for vpc_alias
         role_names = instance.roles.map(&:name)
         instance.vpc_id = setup_vpc(instance.network, instance.vpc_cidr).id
-        instance.gateway = host_env.private_nic.gateway
+
+        # Check the instance config for a private_nic, then the cloud provider
+        private_nic = host_env.private_nic || cloud_env.private_nic
+
+        unless private_nic
+          raise "private_nic configuration required at either the instance level or cloud provider level"
+        end
+
+        instance.gateway = private_nic.gateway
         private_public = instance.gateway == 'public' ? 'public' : 'private'
 
         instance.subnet_id = setup_vpc_subnet(
           instance.vpc_id,
           instance.network,
-          host_env.private_nic,
+          private_nic,
           instance.zone,
           "#{instance.network} #{instance.zone} #{private_public}"
         ).subnet_id

data/lib/rubber/recipes/rubber/setup.rb

@@ -599,7 +599,10 @@ namespace :rubber do
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
     if env.dns_provider
       provider = Rubber::Dns::get_provider(env.dns_provider, env)
-      provider.update(instance_item.name, instance_item.external_ip)
+
+      if instance_item.external_ip && (instance_item.external_ip.length > 0)
+        provider.update(instance_item.name, instance_item.external_ip)
+      end
 
       # add the ip aliases for web tools hosts so we can map internal tools
       # to their own vhost to make proxying easier (rewriting url paths for

data/lib/rubber/recipes/rubber/volumes.rb

@@ -122,7 +122,13 @@ namespace :rubber do
       # we don't mount/format at this time if we are doing a RAID array
       if vol_spec['mount'] && vol_spec['filesystem']
         # then format/mount/etc if we don't have an entry in hosts file
-        task :_setup_volume, :hosts => ic.external_ip do
+        if ic.external_ip && (ic.external_ip.length > 0)
+          host = ic.external_ip
+        else
+          host = ic.internal_ip
+        end
+
+        task :_setup_volume, :hosts => host do
           rubber.sudo_script 'setup_volume', <<-ENDSCRIPT
             # Make sure the newly added volume was found.
             rescan-scsi-bus || true
@@ -160,7 +166,7 @@ namespace :rubber do
               #{("mkdir -p '#{vol_spec['mount']}'") if vol_spec['mount']}
               #{("mount '#{vol_spec['mount']}'") if vol_spec['mount']}
 
-            elif ! grep -q '#{vol_spec['mount']}' /etc/fstab | grep -q '#{vol_spec['device']}'; then
+            elif ! grep -q '#{vol_spec['mount']}\>' /etc/fstab | grep -q '#{vol_spec['device']}'; then
               echo 'You already have #{vol_spec['mount']} mounted as a different device in /etc/fstab'
               echo 'Please choose a different mount point or manually edit /etc/fstab'
               echo 'and re-run cap rubber:setup_volumes'

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '3.2.1'.freeze
+  VERSION = '3.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -170,7 +170,6 @@ files:
 - ".travis.yml"
 - CHANGELOG
 - Gemfile
-- Gemfile.1.8.7
 - LICENSE
 - README.md
 - Rakefile
@@ -689,7 +688,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A capistrano plugin for managing multi-instance deployments to the cloud

data/Gemfile.1.8.7

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gem 'jruby-openssl', :platform => :jruby
-gem 'unlimited-strength-crypto', :platform => :jruby
-gem 'nokogiri', '~>1.5.0'
-gem 'mime-types', '~>1.25'
-
-# Specify your gem's dependencies in rubber.gemspec
-gemspec