conan 0.4.1 → 0.4.2

data/bin/conan

@@ -16,7 +16,7 @@ Commands:
 Options:
 END
 
-settings = Conan::Settings.new
+settings = {}
 
 opts = ARGV.options{ |o|
   o.banner << " command"

data/lib/conan/cloud/aws/autoscale.rb

@@ -48,41 +48,43 @@ module AWS
       region = new_conf[:region] || "us-east-1"
 
       compute = Fog::Compute.new(:provider => :aws, :region => region)
-      default_key_name = compute.key_pairs.all.first.name
 
-      default_params = { :instance_monitoring => true,
-                         :instance_type => "m1.small",
-                         :key_name => default_key_name
-                       }
-
-      params = default_params.merge(new_conf)
+      params = {}
+      params['KeyName'] = new_conf[:key_name] || compute.key_pairs.all.first.name
 
       if new_conf[:security_groups] and new_conf[:security_groups].size > 0
-        params[:security_groups] = new_conf[:security_groups].collect { |g| "#{stage}-#{g}" }
+        params['SecurityGroups'] = new_conf[:security_groups].collect { |g| "#{stage}-#{g}" }
       else
-        params[:security_groups] = ["#{stage}-default"]
+        params['SecurityGroups'] = ["#{stage}-default"]
       end
 
-      if params[:server_to_image].nil?
-        params[:image_id] = default_image_id(region, params[:flavor_id], params[:root_device_type]) if params[:image_id].nil?
+      instance_type = new_conf.delete(:instance_type) || "m1.small"
+
+      if new_conf[:server_to_image].nil?
+        if new_conf[:image_id].nil?
+          image_id = default_image_id(region, instance_type, new_conf[:root_device_type]) 
+        else
+          image_id = new_conf[:image_id]
+        end
       else
-        params[:image_id] = create_ami_from_server(params[:server_to_image], region)      end
+        image_id = create_ami_from_server(new_conf[:server_to_image], region)      
+      end
 
       autoscale = Fog::AWS::AutoScaling.new(:region => region)
 
       #need to create new launchconfiugrations with unique names
       #because you can't modify them and you can't delete them if they are attached
       #to an autoscale group
-      params[:id] = "#{ec2_name_tag(name)}-#{Time.now.strftime('%Y%m%d%H%M')}"
+      id = "#{ec2_name_tag(name)}-#{Time.now.strftime('%Y%m%d%H%M')}"
 
-      puts "Creating Autoscale Launch Configuration #{params[:id]}"
-      lc = autoscale.configurations.create(params)
+      puts "Creating Autoscale Launch Configuration #{id}"
+      lc = autoscale.configurations.connection.create_launch_configuration(image_id, instance_type, id, params)
 
-      params[:autoscale_groups].each do |group_name|
+      new_conf[:autoscale_groups].each do |group_name|
         asg = autoscale.groups.get(group_name)
-        "Setting Autoscale Group #{group_name} to use Launch Configration #{params[:id]}"
-        asg.connection.update_auto_scaling_group(asg.id, {"LaunchConfigurationName" => params[:id]})
-      end unless params[:autoscale_groups].nil?
+        "Setting Autoscale Group #{group_name} to use Launch Configration #{id}"
+        asg.connection.update_auto_scaling_group(asg.id, {"LaunchConfigurationName" => id})
+      end unless new_conf[:autoscale_groups].nil?
 
     end
 

data/lib/conan/cloud/aws/create_launch_configuration.rb

@@ -0,0 +1,37 @@
+require 'rubygems'
+require 'fog/aws/requests/auto_scaling/create_launch_configuration'
+
+module Fog
+  module AWS
+      class AutoScaling
+
+        class Real
+
+          def create_launch_configuration(image_id, instance_type, launch_configuration_name, options = {})
+            if block_device_mappings = options.delete('BlockDeviceMappings')
+              block_device_mappings.each_with_index do |mapping, i|
+                for key, value in mapping
+                  options.merge!({ format("BlockDeviceMappings.member.%d.#{key}", i+1) => value })
+                end
+              end
+            end
+            if security_groups = options.delete('SecurityGroups')
+              options.merge!(Fog::AWS.indexed_param('SecurityGroup.member', [*security_groups]))
+            end
+            if options['UserData']
+              options['UserData'] = Base64.encode64(options['UserData'])
+            end
+
+            request({
+              'Action'                  => 'CreateLaunchConfiguration',
+              'ImageId'                 => image_id,
+              'InstanceType'            => instance_type,
+              'LaunchConfigurationName' => launch_configuration_name,
+              :parser                   => Fog::Parsers::AWS::AutoScaling::Basic.new
+            }.merge!(options))
+          end
+
+      end
+    end
+  end
+end

data/lib/conan/cloud/aws/provision.rb

@@ -32,7 +32,10 @@ module AWS
         servers.each do |server|
           if server.tags["stage"] == st
             config = {}
-            config["roles"] = server.tags["roles"].split(", ") unless server.tags["roles"].nil?
+            unless server.tags["roles"].nil?
+              config["roles"] = server.tags["roles"].split(", ")
+              config["roles"] = server.tags["roles"].split(":") unless config["roles"].length > 1 
+            end
             config["alias"] = server.tags["name"]
             if filter_role.nil? || config["roles"].include?(filter_role) 
               server_config[st][server.dns_name] = config

data/lib/conan/cloud/aws/utils.rb

@@ -56,7 +56,7 @@ module AWS
       when "us-west-1"
         ["us-west-1a", "us-west-1b", "us-west-1c"]
       when "eu-west-1"
-        ["eu-west-1a", "eu-west-1b"]
+        ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
       when "ap-northeast-1"
         ["ap-northeast-1a", "ap-northeast-1a"]
       when "ap-southeast-1"

data/lib/conan/deployment.rb

@@ -40,7 +40,7 @@ module Conan
         roles.each do |r, ss|
           next unless roles.include?(r)
           ss.each_with_index do |s, i|
-            role r, s, :primary => (i == 0)
+            role r, s, :primary => (i == 0), :no_release => !roles[:app].include?(s)
           end
         end
       end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70281889180960 !ruby/object:Gem::Requirement
+  requirement: &70360746833680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70281889180960
+  version_requirements: *70360746833680
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70281889178900 !ruby/object:Gem::Requirement
+  requirement: &70360746833020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281889178900
+  version_requirements: *70360746833020
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70281889177220 !ruby/object:Gem::Requirement
+  requirement: &70360746832000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281889177220
+  version_requirements: *70360746832000
 description: Set up a project to enable the provision of infrastructure through AWS
   and the configuration of servers using Chef via Capistrano.
 email:
@@ -57,6 +57,7 @@ files:
 - bin/conan
 - lib/conan/capistrano.rb
 - lib/conan/cloud/aws/autoscale.rb
+- lib/conan/cloud/aws/create_launch_configuration.rb
 - lib/conan/cloud/aws/default_amis.json
 - lib/conan/cloud/aws/provision.rb
 - lib/conan/cloud/aws/security_group.rb