build-cloud 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThiNDI5ODkyNTAyNjc1ZjZjZjAzM2M2NzczYWU5NjRhNDI4ZWMyYg==
+    YjA3NTgxYzZmOTAyMGQ3YWE4NjE3MWVkYjhjYmNlMTIzYjFmNDRlZg==
   data.tar.gz: !binary |-
-    YTc1OGUzNjc3MGZmNTFlMTllYjEyZDJhMWM5YWFmNmNlODE5ZjlmMA==
+    ODRhZjVjNWQ2ZDYzNjEzODhlNDM4ZGYzYzczMDI3NWZkODJjZTk4Yw==
 SHA512:
   metadata.gz: !binary |-
-    NzhmYTkwNWRiMmYxNTE2Njg4M2JmMmYzZmI2YjdhNjkxZmM2YmExZTY0ZTYx
-    YWE2M2Y4NTBiOTUyMjNhMWEyMWFkZjAyOTFjMzg0OTEyZDhkYzA4OGVkYjll
-    NDYwOTM4OTE4ZmU5MjhlNGI4ZjcyOGIyZTMxN2EyMWJmNzU3YmM=
+    M2E0NjBhYjUxMDFlZjc4MDRiZmY2OWU4ZDg2MmEwMDRhOGJkNThlNmU1MWE4
+    NWRkZWJjODAyYmUwODNhYmM1NmQxMmZhNzA4Y2RiZmE3NDJiNTg1ZDExMTgz
+    YjkyMGI2ZTUyYThhODdkYjE1NDI1NzgyNTY5MzMzNTYzOWFmYjU=
   data.tar.gz: !binary |-
-    M2VmMzFlZGI1OGJlZjE1N2EyZThiZjg5NzA3M2Y2OWM2OTQ3MTUwNWFjZTFj
-    N2RhNTgzYzQ5MDlkODQ0MGRiMDdlNzBjMjhkMjE4YWI4NTIwMjA4YjczYTA4
-    NGVjYjMwNTA4ZmQ1MzgzMGRkODEwODQ2NmNlMDUxNDk3YWE1ODM=
+    MTNhYjg4NzQyOTg0OThlNzNjNjkyZWFmMWVhOTUxNWNkZmUwODQxZDdkMGZk
+    NTU0OTdiMjY1MzI4YWMzY2M1ODFjMTRkYmI0ZDliY2E0NTE3MThiMTc4NTQ3
+    MmI1NDRmZGVmY2Q3NDhkN2NlZmNkYTZjYjRkNjI4NWY4Yjg5OGU=

data/README.md

@@ -22,6 +22,8 @@ See the command line help for `build-cloud`.
 
 ## Changelog
 
+2014-09-16 - version 0.0.5 - now supports creation of DHCP Options Sets, and specifying them using the `:dhcp_options_set_name` key to a VPC.
+
 2014-09-15 - version 0.0.4 - files can now be passed to `--config` with a path. It is no longer assumed that all files will be in the same directory.
 
 2014-09-15 - version 0.0.3 - now accepts multiple files to `--config`. The second and subsequent files are merged into the first YAML file in order, ahead of any files specified in a `:include` list in the first YAML file.

data/bin/build-cloud

@@ -28,6 +28,8 @@ require 'build-cloud/instance'
 require 'build-cloud/ebsvolume'
 require 'build-cloud/networkinterface'
 require 'build-cloud/internetgateway'
+require 'build-cloud/dhcpoptionsset'
+
 
 options = {}
 optparse = OptionParser.new do |opts|

data/build-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "build-cloud"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["The Scale Factory"]
   spec.email         = ["info@scalefactory.com"]
   spec.summary       = %q{Tools for building resources in AWS}

data/lib/build-cloud.rb

@@ -97,34 +97,36 @@ class BuildCloud
     def self.dispatch
 
         {
-            :vpcs                  => BuildCloud::VPC,
-            :internet_gateways     => BuildCloud::InternetGateway,
-            :subnets               => BuildCloud::Subnet,
-            :route_tables          => BuildCloud::RouteTable,
-            :zones                 => BuildCloud::Zone,
-            :security_groups       => BuildCloud::SecurityGroup,
-            :network_interfaces    => BuildCloud::NetworkInterface,
-            :routes                => BuildCloud::Route,
-            :launch_configurations => BuildCloud::LaunchConfiguration,
-            :load_balancers        => BuildCloud::LoadBalancer,
-            :as_groups             => BuildCloud::ASGroup,
-            :r53_record_sets       => BuildCloud::R53RecordSet,
-            :rds_servers           => BuildCloud::RDSServer,
-            :db_subnet_groups      => BuildCloud::DbSubnetGroup,
-            :db_parameter_groups   => BuildCloud::DbParameterGroup,
-            :cache_subnet_groups   => BuildCloud::CacheSubnetGroup,
-            :cache_clusters        => BuildCloud::CacheCluster,
+            :vpcs                   => BuildCloud::VPC,
+            :internet_gateways      => BuildCloud::InternetGateway,
+            :subnets                => BuildCloud::Subnet,
+            :route_tables           => BuildCloud::RouteTable,
+            :zones                  => BuildCloud::Zone,
+            :security_groups        => BuildCloud::SecurityGroup,
+            :network_interfaces     => BuildCloud::NetworkInterface,
+            :routes                 => BuildCloud::Route,
+            :launch_configurations  => BuildCloud::LaunchConfiguration,
+            :load_balancers         => BuildCloud::LoadBalancer,
+            :as_groups              => BuildCloud::ASGroup,
+            :r53_record_sets        => BuildCloud::R53RecordSet,
+            :rds_servers            => BuildCloud::RDSServer,
+            :db_subnet_groups       => BuildCloud::DbSubnetGroup,
+            :db_parameter_groups    => BuildCloud::DbParameterGroup,
+            :cache_subnet_groups    => BuildCloud::CacheSubnetGroup,
+            :cache_clusters         => BuildCloud::CacheCluster,
             :cache_parameter_groups => BuildCloud::CacheParameterGroup,
-            :iam_roles             => BuildCloud::IAMRole,
-            :s3_buckets            => BuildCloud::S3Bucket,
-            :instances             => BuildCloud::Instance,
-            :ebs_volumes           => BuildCloud::EBSVolume,
+            :iam_roles              => BuildCloud::IAMRole,
+            :s3_buckets             => BuildCloud::S3Bucket,
+            :instances              => BuildCloud::Instance,
+            :ebs_volumes            => BuildCloud::EBSVolume,
+            :dhcp_options_sets      => BuildCloud::DHCPOptionsSet,
         }
 
     end
 
     def self.create_order
         [
+            :dhcp_options_sets,
             :vpcs,
             :internet_gateways,
             :iam_roles,

data/lib/build-cloud/dhcpoptionsset.rb

@@ -0,0 +1,77 @@
+class BuildCloud::DHCPOptionsSet
+
+    include ::BuildCloud::Component
+
+    @@objects = []
+
+    def self.get_id_by_name( name )
+
+        dhcp_option = self.search( :name => name ).first
+
+        unless dhcp_option
+            raise "Couldn't get a DHCP Options Set object for #{name} - is it defined?"
+        end
+
+        dhcp_option_fog = dhcp_option.read
+
+        unless dhcp_option_fog
+            raise "Couldn't get a DHCP Options Set fog object for #{name} - is it created?"
+        end
+
+        dhcp_option_fog.id
+
+    end
+
+    def initialize ( fog_interfaces, log, options = {} )
+
+        @compute = fog_interfaces[:compute]
+        @log     = log
+        @options = options
+
+        @log.debug( options.inspect )
+
+        required_options(:dhcp_configuration_set)
+
+    end
+
+    def create
+        
+        return if exists?
+
+        @log.info( "Creating new DHCP Options Set for #{@options[:name]}" )
+
+        options = @options.dup
+
+        options[:tags] = { 'Name' => options.delete(:name) }
+
+        dhcp_option = @compute.dhcp_options.new( options )
+        dhcp_option.save
+
+        @compute.create_tags( dhcp_option.id, options[:tags] )
+
+        @log.debug( dhcp_option.inspect )
+
+    end
+
+    def read
+        @compute.dhcp_options.select { |d| d.tag_set['Name'] == @options[:name] }.first
+    end
+
+    alias_method :fog_object, :read
+
+    def delete
+
+        return unless exists?
+
+        @log.info( "Deleting DHCP Options Set for #{@options[:name]}" )
+
+        fog_object.destroy
+
+    end
+
+    def [](key)
+        @options[key]
+    end
+
+end
+

data/lib/build-cloud/instance.rb

@@ -114,7 +114,13 @@ class BuildCloud::Instance
         elsif options[:user_data_template]
 
             variable_hash = options[:user_data_variables]
-            user_data_template_path = File.join( Dir.pwd, options[:user_data_template])
+
+            user_data_template_path = ''
+            if options[:user_data_template].include? '/'
+                user_data_template_path = options[:user_data_template]
+            else
+                user_data_template_path = File.join( Dir.pwd, options[:user_data_template])
+            end
 
             if File.exists?( user_data_template_path )
                 template = File.read( user_data_template_path )

data/lib/build-cloud/launchconfiguration.rb

@@ -58,7 +58,13 @@ class BuildCloud::LaunchConfiguration
         elsif options[:user_data_template]
 
             variable_hash = options[:user_data_variables]
-            user_data_template_path = File.join( Dir.pwd, options[:user_data_template])
+
+            user_data_template_path = ''
+            if options[:user_data_template].include? '/'
+                user_data_template_path = options[:user_data_template]
+            else
+                user_data_template_path = File.join( Dir.pwd, options[:user_data_template])
+            end
 
             if File.exists?( user_data_template_path )
                 template = File.read( user_data_template_path )

data/lib/build-cloud/vpc.rb

@@ -42,6 +42,14 @@ class BuildCloud::VPC
 
         vpc = @compute.vpcs.new( @options )
         vpc.save
+        wait_until_ready
+
+        if @options[:dhcp_options_set_name]
+            dhcp_option_set_id = BuildCloud::DHCPOptionsSet.get_id_by_name( @options[:dhcp_options_set_name] )
+            @log.info( "Associating DHCP Options Set #{dhcp_option_set_id} with new VPC ID #{vpc.id}" )
+            @compute.associate_dhcp_options( dhcp_option_set_id,
+                                             vpc.id )
+        end
 
         @log.debug( vpc.inspect )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - The Scale Factory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - lib/build-cloud/dbparametergroup.rb
 - lib/build-cloud/dbparameters.rb
 - lib/build-cloud/dbsubnetgroup.rb
+- lib/build-cloud/dhcpoptionsset.rb
 - lib/build-cloud/ebsvolume.rb
 - lib/build-cloud/iamrole.rb
 - lib/build-cloud/instance.rb