rubber 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a59a4d64e36a68db212a6981a372bca1c068dd
-  data.tar.gz: 7ceb0e3669077e1c233cfe4591070138bf34950f
+  metadata.gz: d4a86ae39c4c054ff5a2ee091be683d011eca4b9
+  data.tar.gz: 2eb0ad4e985ed83c0937a682955e4498d99140c6
 SHA512:
-  metadata.gz: 16199697b6e470ef26c5408a628abee2ac085fb72db8ce240d37b544aae62d32923988b188d292472cf38e141392c181eaa29f479c16d9b77e4eb551cbb1668d
-  data.tar.gz: 74e1de3912d38cb50150d6c80d40e4c82ad3f66423c70770b424b75de7bbdde5a40e9e76eb81a403c162826b2312ccdca113a8011b3f6af72d378b6d24475f37
+  metadata.gz: ddf6ae11d0479fb544f4e9c093839503ab3ddd1d3f75057e207ab4612cfbe1002c33d354961b6fcddb32689f9c5a3dc2c327cc1ec10e9f85cfa04ddf28f4beb1
+  data.tar.gz: 671bda85dea0936d593772f405ec5536fc841a2cb9fa217f85553ce3221ae3448dd0eb382f96ec66890b7281b14c74e85af30278f90254266ce4e29931464455

data/CHANGELOG

@@ -1,3 +1,24 @@
+2.15.0 (10/24/2014)
+
+New Features:
+============
+
+[core] Add the ability to pass custom fog specific options during instance and volume creation. <a2e1c67>
+
+Improvements:
+============
+
+[base] Document private networking support for new Digital Ocean regions: New York 3 and Amsterdam 3. <e85360f>
+[base] Switch from ext3 to ext4 as the example filesystem in volume creation. <a21b95d>
+
+Bug Fixes:
+=========
+
+[nginx] Add Nginx parameter required by DigitalOcean droplets. <24ac1aa>
+[postgresql] Surround postgresql database name with quotes to avoid syntax error when using dash. <4017979>
+
+
+
 2.14.0 (10/13/2014)
 
 Improvements:

data/lib/rubber/cloud/aws.rb

@@ -320,7 +320,11 @@ module Rubber
       end
 
       def create_volume(instance, volume_spec)
-        volume = compute_provider.volumes.create(:size => volume_spec['size'], :availability_zone => volume_spec['zone'])
+        fog_options = Rubber::Util.symbolize_keys(volume_spec['fog_options'] || {})
+        volume_data = {
+            :size => volume_spec['size'], :availability_zone => volume_spec['zone']
+        }.merge(fog_options)
+        volume = compute_provider.volumes.create(volume_data)
         volume.id
       end
 

data/lib/rubber/cloud/digital_ocean.rb

@@ -29,11 +29,11 @@ module Rubber
         super(env, capistrano)
       end
 
-      # As of July 2014 Digital Ocean supports private networking in
-      # New York 2 (id 4), Amsterdam 2 (id 5), Singapore 1 (id 6) and London 1 (id 7)
-      REGIONS_WITH_PRIVATE_NETWORKING = [4, 5, 6, 7]
+      # As of October 2014 Digital Ocean supports private networking in
+      # New York 2 (id 4), New York 3 (id 8), Amsterdam 2 (id 5), Amsterdam 3 (id 9), Singapore 1 (id 6) and London 1 (id 7)
+      REGIONS_WITH_PRIVATE_NETWORKING = [4, 5, 6, 7, 8, 9]
 
-      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region)
+      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region, fog_options={})
         do_region = compute_provider.regions.find { |r| r.name == region }
         if do_region.nil?
           raise "Invalid region for DigitalOcean: #{region}"
@@ -64,12 +64,14 @@ module Rubber
           end
         end
 
-        response = compute_provider.servers.create(:name => "#{Rubber.env}-#{instance_alias}",
+        response = compute_provider.servers.create({:name => "#{Rubber.env}-#{instance_alias}",
                                                    :image_id => image.id,
                                                    :flavor_id => flavor.id,
                                                    :region_id => do_region.id,
                                                    :ssh_key_ids => [ssh_key['id']],
-                                                   :private_networking => (env.private_networking.to_s.downcase == 'true'))
+                                                   :private_networking => (env.private_networking.to_s.downcase == 'true')}.
+                                                   merge(Rubber::Util.symbolize_keys(fog_options))
+        )
 
         response.id
       end

data/lib/rubber/cloud/fog.rb

@@ -29,13 +29,15 @@ module Rubber
         raise NotImplementedError, "No table store available for generic fog adapter"
       end
 
-      def create_instance(instance_alias, ami, ami_type, security_groups, availability_zone, region)
-        response = compute_provider.servers.create(:image_id => ami,
+      def create_instance(instance_alias, ami, ami_type, security_groups, availability_zone, region, fog_options={})
+
+        response = compute_provider.servers.create({:image_id => ami,
                                                    :flavor_id => ami_type,
                                                    :groups => security_groups,
                                                    :availability_zone => availability_zone,
                                                    :key_name => env.key_name,
-                                                   :name => instance_alias)
+                                                   :name => instance_alias}.merge(
+                                                       Rubber::Util.symbolize_keys(fog_options)))
 
         response.id
       end

data/lib/rubber/cloud/generic.rb

@@ -26,7 +26,7 @@ module Rubber
         'active'
       end
 
-      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region)
+      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region, fog_options={})
         instance = {}
         instance[:id] = instance_alias
         instance[:state] = active_state
@@ -35,7 +35,7 @@ module Rubber
         instance[:provider] = 'generic'
         instance[:platform] = Rubber::Platforms::LINUX
 
-        Generic.add_instance(instance)
+        Generic.add_instance(instance.merge(Rubber::Util.symbolize_keys(fog_options)))
 
         instance_alias
       end

data/lib/rubber/cloud/vsphere.rb

@@ -29,7 +29,7 @@ module Rubber
         super(env, capistrano)
       end
 
-      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, datacenter)
+      def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, datacenter, fog_options={})
         if env.domain.nil?
           raise "'domain' value must be configured"
         end
@@ -199,7 +199,8 @@ module Rubber
           config[:eager_zero] = eager_zero
         end
 
-        volume = server.volumes.create(config)
+        fog_options = Rubber::Util.symbolize_keys(volume_spec['fog_options'] || {})
+        volume = server.volumes.create(config.merge(fog_options))
 
         volume.id
       end

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

@@ -274,6 +274,7 @@ namespace :rubber do
     ami_type = cloud_env.image_type
     availability_zone = cloud_env.availability_zone
     region = cloud_env.region
+    fog_options = cloud_env.fog_options || {}
 
     create_spot_instance ||= cloud_env.spot_instance
 
@@ -281,7 +282,7 @@ namespace :rubber do
       spot_price = cloud_env.spot_price.to_s
 
       logger.info "Creating spot instance request for instance #{ami}/#{ami_type}/#{security_groups.join(',') rescue 'Default'}/#{availability_zone || 'Default'}"
-      request_id = cloud.create_spot_instance_request(spot_price, ami, ami_type, security_groups, availability_zone)
+      request_id = cloud.create_spot_instance_request(spot_price, ami, ami_type, security_groups, availability_zone, fog_options)
 
       print "Waiting for spot instance request to be fulfilled"
       max_wait_time = cloud_env.spot_instance_request_timeout || (1.0 / 0) # Use the specified timeout value or default to infinite.
@@ -308,7 +309,7 @@ namespace :rubber do
 
     if !create_spot_instance || (create_spot_instance && max_wait_time < 0)
       logger.info "Creating instance #{ami}/#{ami_type}/#{security_groups.join(',') rescue 'Default'}/#{availability_zone || region || 'Default'}"
-      instance_id = cloud.create_instance(instance_alias, ami, ami_type, security_groups, availability_zone, region)
+      instance_id = cloud.create_instance(instance_alias, ami, ami_type, security_groups, availability_zone, region, fog_options)
     end
 
     logger.info "Instance #{instance_alias} created: #{instance_id}"

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.14.0'.freeze
+  VERSION = '2.15.0'.freeze
 end

data/templates/base/config/rubber/rubber.yml

@@ -89,6 +89,17 @@ cloud_providers:
     image_type: c1.medium
     image_id: ami-90c574f8
 
+    # OPTIONAL: Provide fog-specific options directly.  This should only be used if you need a special setting that
+    # Rubber does not directly expose.  Since these settings will be passed directly through to fog, we can't make any
+    # guarantee about how they work (if fog renames an attribute, e.g., your config will break).  Please see the fog
+    # source code for the option names.
+    # fog_options:
+      # EBS I/O optimized instance
+      # EBS-optimized instances deliver dedicated throughput between Amazon EC2 and Amazon EBS, with options
+      # between 500 Mbps and 1000 Mbps depending on the instance type used.
+      # Read more and make sure that your image_type supports ebs_optimized function at: http://aws.amazon.com/ec2/instance-types/
+      # ebs_optimized: false
+
     # OPTIONAL: EC2 spot instance request support.
     #
     # Enables the creation of spot instance requests.  Rubber will wait synchronously until the request is fulfilled,
@@ -324,21 +335,39 @@ staging_roles: "#{known_roles.reject {|r| r =~ /slave/ || r =~ /^db$/ }.join(','
 #         zone: us-east-1a # zone to create volume in, needs to match host's zone
 #         device: /dev/sdh # OS device to attach volume to
 #         mount: /mnt/mysql # The directory to mount this volume to
-#         filesystem: ext3 # the filesystem to create on volume
-#       - size: 10 # size of vol in GBs
-#         zone: us-east-1a # zone to create volume in, needs to match host's zone
-#         device: /dev/sdi # OS device to attach volume to
-#         mount: /mnt/logs # The directory to mount this volume to
-#         filesystem: ext3 # the filesystem to create on volume
+#         filesystem: ext4 # the filesystem to create on volume
+#
+#         # OPTIONAL: Provide fog-specific options directly.  This should only be used if you need a special setting that
+#         # Rubber does not directly expose.  Since these settings will be passed directly through to fog, we can't make any
+#         # guarantee about how they work (if fog renames an attribute, e.g., your config will break).  Please see the fog
+#         # source code for the option names.
+#         fog_options:
+#           type: standard # type of volume, standard or io1
+#           iops: 500 # The number of I/O operations per second (IOPS) that the volume supports.
+#                     # Required when the volume type is io1; not used with standard volumes.
+#       - size: 10
+#         zone: us-east-1a
+#         device: /dev/sdi
+#         mount: /mnt/logs
+#         filesystem: ext4
+#         fog_options:
+#           type: standard
+#           iops: 500
 #
 #       # volumes without mount/filesystem can be used in raid arrays
 #
-#       - size: 50 # size of vol in GBs
-#         zone: us-east-1a # zone to create volume in, needs to match host's zone
-#         device: /dev/sdx # OS device to attach volume to
-#       - size: 50 # size of vol in GBs
-#         zone: us-east-1a # zone to create volume in, needs to match host's zone
-#         device: /dev/sdy # OS device to attach volume to
+#       - size: 50
+#         zone: us-east-1a
+#         device: /dev/sdx
+#         fog_options:
+#           type: gp2
+#           iops: 500
+#       - size: 50
+#         zone: us-east-1a
+#         device: /dev/sdy
+#         fog_options:
+#           type: gp2
+#           iops: 500
 #
 #    # Use some ephemeral volumes for raid array
 #    local_volumes:

data/templates/discourse/config/rubber/role/nginx/nginx.conf

@@ -21,6 +21,7 @@ http
   sendfile          on;
   tcp_nopush        on;
   tcp_nodelay       off;
+  types_hash_max_size 2048;
 
   gzip              on;
   gzip_http_version 1.0;

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

@@ -1,7 +1,7 @@
 namespace :rubber do
-  
+
   namespace :postgresql do
-    
+
     rubber.allow_optional_tasks(self)
 
     before "rubber:install_packages", "rubber:postgresql:setup_apt_sources"
@@ -12,7 +12,7 @@ namespace :rubber do
         wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -
       ENDSCRIPT
     end
-    
+
     after "rubber:create", "rubber:postgresql:validate_db_roles"
 
     task :validate_db_roles do
@@ -25,16 +25,16 @@ namespace :rubber do
     end
 
     after "rubber:bootstrap", "rubber:postgresql:bootstrap"
-    
+
     # Bootstrap the production database config.  Db bootstrap is special - the
     # user could be requiring the rails env inside some of their config
     # templates, which creates a catch 22 situation with the db, so we try and
     # bootstrap the db separate from the rest of the config
     task :bootstrap, :roles => [:postgresql_master, :postgresql_slave] do
-      
+
       # Conditionally bootstrap for each node/role only if that node has not
       # been bootstrapped for that role before
-      master_instances = rubber_instances.for_role("postgresql_master") & rubber_instances.filtered  
+      master_instances = rubber_instances.for_role("postgresql_master") & rubber_instances.filtered
       master_instances.each do |ic|
         task_name = "_bootstrap_postgresql_master_#{ic.full_name}".to_sym
         task task_name, :hosts => ic.full_name do
@@ -55,7 +55,7 @@ namespace :rubber do
             rubber.sudo_script "create_master_db", <<-ENDSCRIPT
               sudo -i -u postgres psql -c "#{create_user_cmd}"
               sudo -i -u postgres psql -c "#{create_replication_user_cmd}"
-              sudo -i -u postgres psql -c "CREATE DATABASE #{env.db_name} WITH OWNER #{env.db_user}"
+              sudo -i -u postgres psql -c "CREATE DATABASE \"#{env.db_name}\" WITH OWNER #{env.db_user}"
             ENDSCRIPT
           end
         end
@@ -91,7 +91,7 @@ namespace :rubber do
     def common_bootstrap
       # postgresql package install starts postgresql, so stop it
       rsudo "#{rubber_env.postgresql_ctl} stop" rescue nil
-      
+
       # After everything installed on machines, we need the source tree
       # on hosts in order to run rubber:config for bootstrapping the db
       rubber.update_code_for_bootstrap
@@ -114,15 +114,15 @@ namespace :rubber do
     task :promote_slave do
       master_alias = get_env('MASTER', "Master alias (e.g. db01)", true)
       slave_alias = get_env('SLAVE', "Slave alias (e.g. db02)", true)
-      
+
       # remove the master instance so rubber doesn't try to deploy to it
       # Stays running so needs to be manually deleted
       master_instance = rubber_instances.remove(master_alias)
       fatal "Master Instance does not exist: #{master_alias}" unless master_instance
-      
+
       slave_instance = rubber_instances[slave_alias]
       fatal "Slave Instance does not exist: #{slave_alias}" unless slave_instance
-      
+
       # remove all db roles from slave
       slave_instance.roles.delete_if {|ir| ir.name =~ /db|postgresql/ }
 
@@ -130,9 +130,9 @@ namespace :rubber do
       new_roles = [Rubber::Configuration::RoleItem.parse("postgresql_master")]
       new_roles = Rubber::Configuration::RoleItem.expand_role_dependencies(new_roles, get_role_dependencies)
       slave_instance.roles = (slave_instance.roles + new_roles).uniq
-      
+
       rubber_instances.save()
-      
+
       begin
         Timeout::timeout(10) do
           logger.info "Stopping server on original master #{master_alias}"
@@ -142,10 +142,10 @@ namespace :rubber do
       rescue StandardError
         logger.info "Failed to connect to original master, promoting slave anyway"
       end
-      
+
       logger.info "Triggering slave promotion on new master #{slave_alias}"
       rsudo "touch #{rubber_env.postgresql_data_dir}/trigger_file", :hosts => slave_instance.full_name
-      
+
       logger.info "The master instance has been removed from instances, but remains running:"
       logger.info "#{master_alias}, #{master_instance.instance_id}, #{master_instance.external_ip}"
       logger.info ''
@@ -161,14 +161,14 @@ namespace :rubber do
     task :start, :roles => [:postgresql_master, :postgresql_slave] do
       rsudo "#{rubber_env.postgresql_ctl} start"
     end
-    
+
     desc <<-DESC
       Stops the postgresql daemons
     DESC
     task :stop, :roles => [:postgresql_master, :postgresql_slave] do
       rsudo "#{rubber_env.postgresql_ctl} stop || true"
     end
-  
+
     desc <<-DESC
       Restarts the postgresql daemons
     DESC
@@ -179,4 +179,4 @@ namespace :rubber do
 
   end
 
-end
+end

data/test/cloud/aws_test.rb

@@ -28,10 +28,14 @@ class AwsTest < Test::Unit::TestCase
     should "create instance" do
       assert @cloud.create_instance('', '', '', '', '', '')
     end
+
+    should "create instance with opts" do
+      assert @cloud.create_instance('', '', '', '', '', '', :ebs_optimized => true)
+    end
   end
 
   context "aws with alternative region" do
-    
+
     setup do
       @region = "ap-southeast-2"
       env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => @region}

data/test/cloud/fog_test.rb

@@ -32,5 +32,8 @@ class FogTest < Test::Unit::TestCase
       assert @cloud.create_instance('', '', '', '', '', '')
     end
 
+    should "create instance with options" do
+      assert @cloud.create_instance('', '', '', '', '', '', :foo => :bar)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement