rubber 2.12.2 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331df14a974871cbe3939df12e1ea37fe2d1b625
-  data.tar.gz: fe492705ec10139570c3d151720cc2ced3821730
+  metadata.gz: ab0ab6d9b549a41b15aff33366f303d4245bce3d
+  data.tar.gz: 2bb33a094d043c0da799b9cfa9a7049ebde4dfe8
 SHA512:
-  metadata.gz: a1dbd4058e402bbecd5046810b8a464c54c15010ba6f543a8ccdfc1c285b9847254463be136db7aa8a1b1c9dc10d627a27618578fb1a0aa2ac32abcc50da6daa
-  data.tar.gz: 937f8764da1bd2a9681a954c06bb5cdc81506c896eedc577ff1a247e212fa257451b21472ffd2826992f401b6919a420641ca839258c5ba29a73b1298539d58a
+  metadata.gz: e328f32286a8d3bad4ecef5d0f248ace669da4eb8e384b169b29c999735d6240eae420560e194ecab82b27a078b16e5d3ab0a11f162675d8fdc4227c324cb0e6
+  data.tar.gz: 2aaad28bef809b031f579533debf52ea27cd39de9e2a88ffa6d20d061af12bd0f9df3ba0642e3fb4799b62373c95d7df671536b78ad58acf756a684b9db93293

data/CHANGELOG

@@ -1,3 +1,30 @@
+2.13.0 (10/01/2014)
+
+New Features:
+============
+
+[base] Ubuntu 14.04 support.
+[core] Added a way of specifying packages to be installed by OS version. <a682955>
+[core] Added a way to retrieve the OS version for an instance. <1954d06, 59a5929, 491cd7e>
+[core] Added a 'rubber_instance' helper method for use in templates and Capistrano tasks to reference the instance being deployed to. <4281344, 52ff83d, f94db86>
+
+Improvements:
+============
+
+[apache] Updated config to work with both Apache 2.2 and 2.4. <8afa6df>
+[graphite] Updated the graphite template to work in both Ubuntu 12.04 and 14.04. <97a86ca, 7fef018, ce328d6>
+[passenger] Updated config to work with both Apache 2.2 and 2.4. <8afa6df>
+[postgresql] Always use the pgdg apt repository since it supports all Ubuntu LTS releases on all supported versions of PostgreSQL. <b1aeb00>
+
+Bug Fixes:
+=========
+
+[core] Fixed a regression whereby we might try to generate config before all the files have been pushed. <a0d6c32>
+[core] Fixed a regression whereby we would try to deploy to non-Linux servers, even though they're not supported. <513e0e1>
+[core] Worked around an issue with Ubuntu 14.04 and vSphere whereby VMware Tools won't correctly populate the DNS list. <15216b7, d1fceac>
+[core] Make sure VMs can still be refreshed in vSphere even if the VMware Tools installation is out-of-date. <546ec93>
+
+
 2.12.2 (08/26/2014)
 
 Improvements:

data/lib/rubber/cli.rb

@@ -11,7 +11,6 @@ module Rubber
   class CLI < Clamp::Command
     
     # setup clamp subcommands for each rubber command
-    command_classes = []
     Rubber::Commands.constants.each do |c|
       clazz = Rubber::Commands.const_get(c)
       if clazz.class == Class && clazz.ancestors.include?(Clamp::Command) &&

data/lib/rubber/cloud/aws_table_store.rb

@@ -23,7 +23,7 @@ module Rubber
       end
   
       # create the table if needed
-      def ensure_table_key()
+      def ensure_table_key
         Rubber::Util.retry_on_failure(*RETRYABLE_EXCEPTIONS) do
           begin
             @metadata = @table_provider.domain_metadata(@table_key)

data/lib/rubber/cloud/fog_storage.rb

@@ -18,7 +18,7 @@ module Rubber
       end
   
       # create the bucket if needed
-      def ensure_bucket()
+      def ensure_bucket
         Rubber::Util.retry_on_failure(*RETRYABLE_EXCEPTIONS) do
           @directory = @storage_provider.directories.create(:key => @bucket) unless @directory
         end

data/lib/rubber/cloud/vsphere.rb

@@ -102,6 +102,24 @@ module Rubber
         compute_provider.servers.get(instance_id).destroy(:force => true)
       end
 
+      def after_refresh_instance(instance)
+        rubber_cfg = Rubber::Configuration.get_configuration(Rubber.env)
+        host_env = rubber_cfg.environment.bind(nil, instance.name)
+
+        dns_servers = [host_env.public_nic, env.public_nic, host_env.private_nic, env.private_nic].collect { |nic| nic.dns_servers if nic }.compact.first
+
+        # VMware Tools currently (as of Aug. 25, 2014) has a bug with Ubuntu 14.04 whereby it fails to properly configure
+        # DNS when static IP configurations are used in a customization spec.  This works around the problem by setting
+        # up the resolvconf configuration directly.
+        if dns_servers && ! dns_servers.empty?
+          contents = dns_servers.map { |server| "nameserver #{server}" }.join("\n")
+          contents << "\n"
+
+          capistrano.put(contents, '/etc/resolvconf/resolv.conf.d/base', :mode => '0644', :hosts => instance.external_ip)
+          capistrano.run('resolvconf -u', :hosts => instance.external_ip)
+          end
+      end
+
       def describe_instances(instance_id=nil)
         instances = []
         opts = {}
@@ -118,7 +136,11 @@ module Rubber
 
           instance = {}
           instance[:id] = item.id
-          instance[:state] = item.tools_state
+
+          # If the VM is up, but the VMware Tools installation is out-of-date, just treat it as if the tools installation
+          # is okay.  Otherwise, the rubber:refresh process won't detect that the VM has booted properly, even though
+          # it's running just fine.  In all other cases, use the state reported by the vSphere API call.
+          instance[:state] = item.tools_state == 'toolsOld' ? active_state : item.tools_state
 
           # We can't trust the describe operation when the instance is newly created because the VM customization
           # step likely hasn't completed yet.  This means we'll get back the IP address for the VM template, rather

data/lib/rubber/commands/vulcanize.rb

@@ -77,7 +77,7 @@ module Rubber
         File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'templates'))
       end
 
-      def self.valid_templates()
+      def self.valid_templates
         Dir.entries(self.source_root).delete_if {|e| e =~  /(^\.)|svn|CVS/ }.sort
       end
 

data/lib/rubber/dns/aws.rb

@@ -127,7 +127,7 @@ module Rubber
       
       def find_hosts(opts = {})
         opts = setup_opts(opts, [:host, :domain])
-        result = []
+
         zone = find_or_create_zone(opts[:domain])
         host = opts_to_host(opts)
         
@@ -142,13 +142,14 @@ module Rubber
         hosts = hosts.select {|h| h.name == host[:name] } if opts.has_key?(:host) && opts[:host] != '*'
         hosts = hosts.select {|h| h.type == host[:type] } if opts.has_key?(:type) && opts[:type] != '*'
         
-        return hosts
+        hosts
       end
 
       def find_host_records(opts = {})
         hosts = find_hosts(opts)
         result = hosts.collect {|h| host_to_opts(h).merge(:domain => opts[:domain]) }
-        return result
+
+        result
       end
 
       def create_host_record(opts = {})

data/lib/rubber/generator.rb

@@ -237,14 +237,18 @@ module Rubber
         binding
       end
     
-      def rubber_env()
+      def rubber_env
         Rubber::Configuration.rubber_env
       end
 
-      def rubber_instances()
+      def rubber_instances
         Rubber.instances
       end
 
+      def rubber_instance
+        rubber_instances[rubber_env.host]
+      end
+
     end
 
   end

data/lib/rubber/instance.rb

@@ -140,7 +140,7 @@ module Rubber
         @items.values.find_all {|ic| ic.roles.any? {|r| r.name == role_name && (! options || r.options == options)}}
       end
 
-      def filtered()
+      def filtered
         filtered_results = []
 
         validate_filters()
@@ -160,7 +160,7 @@ module Rubber
         return filtered_results
       end
 
-      def validate_filters()
+      def validate_filters
         aliases = @items.values.collect{|ic| ic.name}
         [@filters, @filters_negated].flatten.each do |f|
           raise "Filter doesn't match any hosts: #{f}" if ! aliases.include?(f)
@@ -172,7 +172,7 @@ module Rubber
         end
       end
 
-      def all_roles()
+      def all_roles
         @items.collect {|n, i| i.role_names}.flatten.uniq
       end
 
@@ -195,6 +195,9 @@ module Rubber
 
     # The configuration for a single instance
     class InstanceItem
+      UBUNTU_OS_VERSION_CMD = 'lsb_release -sr'.freeze
+      VARIABLES_TO_OMIT_IN_SERIALIZATION = ['@capistrano', '@os_version']
+
       attr_reader :name, :domain, :instance_id, :image_type, :image_id, :security_groups
       attr_accessor :roles, :zone
       attr_accessor :external_host, :external_ip
@@ -202,6 +205,7 @@ module Rubber
       attr_accessor :static_ip, :volumes, :partitions, :root_device_type
       attr_accessor :spot_instance_request_id
       attr_accessor :provider, :platform
+      attr_accessor :capistrano
 
       def initialize(name, domain, roles, instance_id, image_type, image_id, security_group_list=[])
         @name = name
@@ -211,6 +215,7 @@ module Rubber
         @image_type = image_type
         @image_id = image_id
         @security_groups = security_group_list
+        @os_version = nil
       end
 
       def self.from_hash(hash)
@@ -226,6 +231,8 @@ module Rubber
       def to_hash
         hash = {}
         instance_variables.each do |iv|
+          next if VARIABLES_TO_OMIT_IN_SERIALIZATION.include?(iv.to_s)
+
           name = iv.to_s.gsub(/^@/, '')
           value = instance_variable_get(iv)
           value = value.collect {|r| r.to_s } if name == 'roles'
@@ -239,10 +246,10 @@ module Rubber
       end
       
       def full_name
-        "#@name.#@domain"
+        "#{@name}.#{@domain}"
       end
 
-      def role_names()
+      def role_names
         roles.collect {|r| r.name}
       end
 
@@ -267,6 +274,41 @@ module Rubber
       def windows?
         platform == Rubber::Platforms::WINDOWS
       end
+
+      def os_version
+        @os_version ||= begin
+          os_version_cmd = Rubber.config.os_version_cmd || UBUNTU_OS_VERSION_CMD
+
+          if capistrano
+            @os_version = capistrano.capture(os_version_cmd, :host => self.full_name).chomp
+          else
+            # If we can't SSH to the machine, we may be able to execute the command locally if this
+            # instance item happens to refer to the same machine we're executing on.
+            if Socket::gethostname == self.full_name
+              @os_version = `#{os_version_cmd}`.chomp
+            else
+              raise "Unable to get os_version for #{self.full_name}"
+            end
+          end
+        end
+      end
+
+      if RUBY_VERSION < '1.9'
+        def to_yaml_properties
+          vars = instance_variables.map { |x| x.to_s }
+          vars - VARIABLES_TO_OMIT_IN_SERIALIZATION
+        end
+
+      else
+        def encode_with(coder)
+          vars = instance_variables.map { |x| x.to_s }
+          vars = vars - VARIABLES_TO_OMIT_IN_SERIALIZATION
+
+          vars.each do |var|
+            coder[var.gsub('@', '')] = eval(var)
+          end
+        end
+      end
     end
 
     # The configuration for a single role contained in the list
@@ -328,7 +370,7 @@ module Rubber
       end
       alias == eql?
 
-      def hash()
+      def hash
         @name.hash
       end
 

data/lib/rubber/recipes/rubber.rb

@@ -65,6 +65,8 @@ namespace :rubber do
     set :rubber_env, rubber_cfg.environment.bind()
     set :rubber_instances, rubber_cfg.instance
 
+    rubber_cfg.instance.each { |instance| instance.capistrano = self }
+
     # Disable connecting to any Windows instance.
     # pass -l to bash in :shell to that run also gets full env
     # use a pty so we don't get "stdin: is not a tty" error output
@@ -147,6 +149,12 @@ namespace :rubber do
 
 end
 
+def top.rubber_instance
+  hostname = capture('hostname').chomp
+
+  rubber_instances[hostname]
+end
+
 Dir[File.join(File.dirname(__FILE__), 'rubber/*.rb')].each do |rubber_part|
   load(rubber_part)
 end

data/lib/rubber/recipes/rubber/deploy.rb

@@ -30,6 +30,8 @@ namespace :rubber do
 
   namespace :config do
 
+    allow_optional_tasks(self)
+
     desc <<-DESC
     Pushes and runs rubber configuration on the deployed rails application
     DESC
@@ -73,7 +75,9 @@ namespace :rubber do
     rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/tmp"
   end
 
-  def push_config
+  def push_config(options = {})
+    path = options.delete(:deploy_path) || config_path
+
     unless fetch(:rubber_config_files_pushed, false)
       # Need to do this so we can work with staging instances without having to
       # checkin instance file between create and bootstrap, as well as during a deploy
@@ -93,7 +97,7 @@ namespace :rubber do
 
         push_files.each do |file|
           dest_file = file.sub(/^#{Rubber.root}\/?/, '')
-          put(File.read(file), File.join(config_path, dest_file), :mode => "+r")
+          put(File.read(file), File.join(path, dest_file), :mode => "+r")
         end
       end
 
@@ -101,7 +105,7 @@ namespace :rubber do
       secret = rubber_cfg.environment.config_secret
       if secret && File.exist?(secret)
         base = rubber_cfg.environment.config_root.sub(/^#{Rubber.root}\/?/, '')
-        put(File.read(secret), File.join(config_path, base, File.basename(secret)), :mode => "+r")
+        put(File.read(secret), File.join(path, base, File.basename(secret)), :mode => "+r")
       end
 
       set :rubber_config_files_pushed, true
@@ -114,6 +118,8 @@ namespace :rubber do
     force = options[:force] || ENV['FORCE']
     file = options[:file] || ENV['FILE']
 
+    push_config(:deploy_path => path)
+
     opts = ""
     opts += " --no_post" if no_post
     opts += " --force"   if force

data/lib/rubber/recipes/rubber/instances.rb

@@ -315,6 +315,7 @@ namespace :rubber do
 
     instance_item = Rubber::Configuration::InstanceItem.new(instance_alias, env.domain, instance_roles, instance_id, ami_type, ami, security_groups)
     instance_item.spot_instance_request_id = request_id if create_spot_instance
+    instance_item.capistrano = self
     rubber_instances.add(instance_item)
     rubber_instances.save()
 

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

@@ -603,8 +603,7 @@ namespace :rubber do
       end
     end
   end
-
-
+  
   def destroy_dyndns(instance_item)
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
     if env.dns_provider
@@ -633,10 +632,19 @@ namespace :rubber do
           expanded_pkg_list << pkg_spec
         end
       end
+
+      @os_specific_opts = get_host_options('os_packages') { |pkg_list| pkg_list.join(' ') }
+
       expanded_pkg_list << 'ec2-ami-tools' if rubber_env.cloud_provider == 'aws'
       expanded_pkg_list.join(' ')
     end
 
+    opts.each do |host, packages|
+      if @os_specific_opts.has_key?(host)
+        opts[host] << " #{@os_specific_opts[host]}"
+      end
+    end
+
     if upgrade
       if ENV['NO_DIST_UPGRADE']
         sudo_script 'upgrade_packages', <<-ENDSCRIPT

data/lib/rubber/recipes/rubber/static_ips.rb

@@ -166,7 +166,7 @@ namespace :rubber do
     logger.info "Run 'cap rubber:describe_static_ips' to check the allocated ones"
   end
 
-  def allocate_static_ip()
+  def allocate_static_ip
     ip = cloud.create_static_ip()
     fatal "Failed to allocate static ip" if ip.nil?
     return ip

data/lib/rubber/recipes/rubber/utils.rb

@@ -207,13 +207,19 @@ namespace :rubber do
   # be installed.
   def get_host_options(cfg_name, &block)
     opts = {}
-    rubber_instances.each do | ic|
+    rubber_instances.each do |ic|
       env = rubber_cfg.environment.bind(ic.role_names, ic.name)
       cfg_value = env[cfg_name]
+
       if cfg_value
+        if cfg_value.is_a?(Hash)
+          cfg_value = cfg_value[ic.os_version]
+        end
+
         if block
           cfg_value = block.call(cfg_value)
         end
+
         opts["hostvar_#{ic.full_name}"] = cfg_value if cfg_value && cfg_value.strip.size > 0
       end
     end
@@ -226,7 +232,7 @@ namespace :rubber do
   end
   
   def update_code_for_bootstrap
-    unless (fetch(:rubber_code_was_updated, false))
+    unless fetch(:rubber_code_was_updated, false)
       deploy.setup
       logger.info "updating code for bootstrap"
       deploy.update_code

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.12.2'.freeze
+  VERSION = '2.13.0'.freeze
 end

data/templates/apache/config/rubber/deploy-apache.rb

@@ -9,7 +9,7 @@ namespace :rubber do
 
     task :install, :roles => :apache do
       rubber.sudo_script 'install_apache', <<-ENDSCRIPT
-        a2dissite default
+        a2dissite *default || true
 
         # TODO: remove this once 12.04 is fixed
         # https://bugs.launchpad.net/ubuntu/+source/mod-proxy-html/+bug/964397