cloudstrap 0.39.0.pre → 0.40.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4cb5dae19069f5a05437bf292d88715c9b6fd8
-  data.tar.gz: 350a4301002b19771dc901e32bbd314d95d9b109
+  metadata.gz: 8d4dab6f668ddb8812d72e3e547d8b86bc6247a0
+  data.tar.gz: 4ca88cf04a0516c9ecce532d7e8e84fec74f2d12
 SHA512:
-  metadata.gz: 86ae2e41ca6d4f34c46df1b46fa43165dd7862224093f6d1e97d15adfd2ec34702068cb6a1bb41f6d25a66784a6c3057899f1d7ffbde960bc57678feb951dab6
-  data.tar.gz: 94b34808bd260573df7dc6a1f0377c0e652191e7dae0739d596810647f9832e1b5c347f742599457d31710a684516f42fbd83b6419aad96960103c20a6ca9916
+  metadata.gz: 871a1b64c78022fa8b450f7f92583f71b385d436338e3f065dccf6b949b60d2b0c17fc43b4b7e0548725ef0b3f232cc1fe053a161d863bcd4028208b98fbb59b
+  data.tar.gz: 3c22f7ff09d79d32677a934ecbdb8cf797738dc90ca2ec21ffd4169f31f816ae6371166c7469126a35600958e357a01ec9f14b4493428db82af2823d095f9952

data/bin/cloudstrap

@@ -69,7 +69,7 @@ BOOTSTRAP_WITHOUT_HUMAN_OVERSIGHT=#{!agent.requires_human_oversight?}
 # Public IPs Enabled in Public Subnet? #{agent.enable_public_ips}
 # Gateway Attached to VPC? #{agent.attach_gateway}
 # Route to Internet via Gateway? #{agent.default_route}
-# Route to NAT Gateway from Private Subnet? #{agent.nat_route}
+# Route to NAT Gateway from Private Subnets? #{agent.configure_nat_routes}
 # SSH Allowed to Jumpbox? #{agent.allow_ssh}
 # SSH Key uploaded to AWS? #{agent.upload_ssh_key}
 # HDP bootstrap.properties configured? #{agent.configure_hdp}

data/cloudstrap.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'faraday', '~> 0.9', '>= 0.9.0'
   gem.add_runtime_dependency 'burdened-acrobat', '~> 0.3', '>= 0.3.4'
   gem.add_runtime_dependency 'path53', '~> 0.4', '>= 0.4.8'
+  gem.add_runtime_dependency 'ipaddress', '~> 0.8', '>= 0.8.3'
 end

data/lib/cloudstrap.rb

@@ -2,3 +2,4 @@ require_relative 'cloudstrap/agent'
 require_relative 'cloudstrap/amazon'
 require_relative 'cloudstrap/bootstrap_agent'
 require_relative 'cloudstrap/config'
+require_relative 'cloudstrap/network'

data/lib/cloudstrap/agent.rb

@@ -6,6 +6,7 @@ require_relative 'amazon'
 require_relative 'config'
 require_relative 'errors'
 require_relative 'hdp/bootstrap_properties'
+require_relative 'network'
 require_relative 'ssh'
 
 module Cloudstrap
@@ -150,32 +151,19 @@ module Cloudstrap
       find_jumpbox_security_group || create_jumpbox_security_group
     end
 
+    Contract None => Network
+    def network
+      @network ||= Network.new config.vpc_cidr_block
+    end
+
     Contract None => String
     def private_subnet
-      @private_subnet ||= ENV.fetch('BOOTSTRAP_PRIVATE_SUBNET_ID') do
-        cache.fetch(:private_subnet_id) do
-          properties = { vpc_id: vpc, cidr_block: config.private_cidr_block }
-          cache.store(:private_subnet_id, (ec2.subnet(properties) || ec2.create_subnet(properties)).tap do |subnet|
-            ec2.assign_name bootstrap_tag, subnet.subnet_id unless subnet.tags.any? do |tag|
-              tag.key == 'Name' && tag.value = bootstrap_tag
-            end
-          end.subnet_id)
-        end
-      end
+      private_subnets.values.first
     end
 
     Contract None => String
     def public_subnet
-      @public_subnet ||= ENV.fetch('BOOTSTRAP_PUBLIC_SUBNET_ID') do
-        cache.fetch(:public_subnet_id) do
-          properties = { vpc_id: vpc, cidr_block: config.public_cidr_block }
-          cache.store(:public_subnet_id, (ec2.subnet(properties) || ec2.create_subnet(properties)).tap do |subnet|
-                        ec2.assign_name bootstrap_tag, subnet.subnet_id unless subnet.tags.any? do |tag|
-                          tag.key == 'Name' && tag.value = bootstrap_tag
-                        end
-                      end.subnet_id)
-        end
-      end
+      public_subnets.values.first
     end
 
     Contract None => String
@@ -235,14 +223,51 @@ module Cloudstrap
       end
     end
 
+    Contract None => HashOf[String, String]
+    def public_subnets
+      network.public_layout(*ec2.availability_zone_names).map do |az, cidr|
+        properties = { vpc_id: vpc, cidr_block: cidr, availability_zone: az }
+        subnet = ec2.subnet(properties) || ec2.create_subnet(properties)
+        ec2.assign_name bootstrap_tag, subnet.subnet_id unless subnet
+                                                                 .tags
+                                                                 .any? do |tag|
+          tag.key == 'Name' && tag.value == bootstrap_tag
+        end
+        [az, subnet.subnet_id]
+      end.to_h
+    end
+
     Contract None => ArrayOf[String]
     def subnets
       [public_subnet, private_subnet]
     end
 
+    Contract None => HashOf[String, String]
+    def private_subnets
+      network.private_layout(*ec2.availability_zone_names).map do |az, cidr|
+        properties = { vpc_id: vpc, cidr_block: cidr, availability_zone: az }
+        subnet = ec2.subnet(properties) || ec2.create_subnet(properties)
+        ec2.assign_name bootstrap_tag, subnet.subnet_id unless subnet
+                                                                 .tags
+                                                                 .any? do |tag|
+          tag.key == 'Name' && tag.value == bootstrap_tag
+        end
+        [az, subnet.subnet_id]
+      end.to_h
+    end
+
     Contract None => Bool
     def enable_public_ips
-      ec2.map_public_ip_on_launch?(public_subnet) || ec2.map_public_ip_on_launch(public_subnet, true)
+      public_subnets.all? do |_, subnet|
+        ec2.map_public_ip_on_launch?(subnet) || ec2.map_public_ip_on_launch(subnet, true)
+      end
+    end
+
+    Contract None => Bool
+    def configure_nat_routes
+      private_subnets.all? do |_, subnet|
+        ec2.associate_route_table private_route_table, subnet
+      end
     end
 
     Contract None => String
@@ -348,28 +373,12 @@ module Cloudstrap
 
     Contract None => String
     def public_availability_zone
-      @public_availability_zone ||= ENV.fetch('BOOTSTRAP_PUBLIC_AVAILABILITY_ZONE') do
-        cache.fetch(:public_availability_zone) do
-          cache.store(:public_availability_zone, ec2
-                                          .subnets
-                                          .select { |subnet| subnet.subnet_id == public_subnet }
-                                          .map { |subnet| subnet.availability_zone }
-                                          .first)
-        end
-      end
+      public_subnets.keys.first
     end
 
     Contract None => String
     def private_availability_zone
-      @private_availability_zone ||= ENV.fetch('BOOTSTRAP_PRIVATE_AVAILABILITY_ZONE') do
-        cache.fetch(:private_availability_zone) do
-          cache.store(:private_availability_zone, ec2
-                                          .subnets
-                                          .select { |subnet| subnet.subnet_id == private_subnet }
-                                          .map { |subnet| subnet.availability_zone }
-                                          .first)
-        end
-      end
+      private_subnets.keys.first
     end
 
     Contract None => String
@@ -400,8 +409,8 @@ module Cloudstrap
         .define('GlusterNodeCount', config.gluster_count)
         .define('AWS.Region', config.region)
         .define('AWS.AvailabilityZones', public_availability_zone)
-        .define('AWS.PublicSubnetIDsAndAZ', [public_subnet, public_availability_zone].join(':'))
-        .define('AWS.PrivateSubnetIDsAndAZ', [private_subnet, private_availability_zone].join(':'))
+        .define('AWS.PublicSubnetIDsAndAZ', public_subnets.invert.map { |*s| s.join(':') }.join(','))
+        .define('AWS.PrivateSubnetIDsAndAZ', private_subnets.invert.map { |*s| s.join(':') }.join(','))
         .define('AWS.Keypair', bootstrap_tag)
         .define('AWS.KeypairFile', '/home/ubuntu/.ssh/id_rsa')
         .define('AWS.JumpboxCIDR', '0.0.0.0/0')

data/lib/cloudstrap/amazon/ec2.rb

@@ -283,13 +283,15 @@ module Cloudstrap
       Contract KeywordArgs[
                  cidr_block: Optional[String],
                  vpc_id: Optional[String],
-                 subnet_id: Optional[String]
+                 subnet_id: Optional[String],
+                 availability_zone: Optional[String]
                ] => ArrayOf[::Aws::EC2::Types::Subnet]
-      def subnets(cidr_block: nil, vpc_id: nil, subnet_id: nil)
+      def subnets(cidr_block: nil, vpc_id: nil, subnet_id: nil, availability_zone: nil)
         subnets
           .select { |subnet| subnet_id.nil? || subnet.subnet_id == subnet_id }
           .select { |subnet| vpc_id.nil? || subnet.vpc_id == vpc_id }
           .select { |subnet| cidr_block.nil? || subnet.cidr_block == cidr_block }
+          .select { |subnet| availability_zone.nil? || subnet.availability_zone == availability_zone }
       end
 
       Contract Args[Any] => Any
@@ -311,7 +313,8 @@ module Cloudstrap
 
       Contract KeywordArgs[
                  cidr_block: String,
-                 vpc_id: String
+                 vpc_id: String,
+                 availability_zone: Optional[String]
                ] => ::Aws::EC2::Types::Subnet
       def create_subnet(**properties)
         call_api(:create_subnet, properties).subnet
@@ -413,6 +416,22 @@ module Cloudstrap
         region_names.include? region_name
       end
 
+      Contract None => ArrayOf[Aws::EC2::Types::AvailabilityZone]
+      def availability_zones!
+        @availability_zones = call_api(:describe_availability_zones)
+                                .availability_zones
+      end
+
+      Contract None => ArrayOf[Aws::EC2::Types::AvailabilityZone]
+      def availability_zones
+        @availability_zones ||= availability_zones!
+      end
+
+      Contract None => ArrayOf[String]
+      def availability_zone_names
+        availability_zones.map(&:zone_name)
+      end
+
       private
 
       def client

data/lib/cloudstrap/network.rb

@@ -0,0 +1,45 @@
+require 'ipaddress'
+
+module Cloudstrap
+  class Network
+    def initialize(network = '10.0.0.0')
+      @network = IPAddress(network).tap { |n| n.prefix = 16 }
+      self
+    end
+
+    attr_reader :network
+
+    def subnets
+      @subnets ||= network.subnet 24
+    end
+
+    def public
+      @public ||= subnets.select { |subnet| subnet.octet(2).even? }
+    end
+
+    def private
+      @private ||= subnets.select { |subnet| subnet.octet(2).odd? }
+    end
+
+    def public_layout(*zones)
+      zones
+        .zip(public.take(zones.size))
+        .map { |zone, subnet| [zone, "#{subnet}/#{subnet.prefix}"] }
+        .to_h
+    end
+
+    def private_layout(*zones)
+      zones
+        .zip(private.take(zones.size))
+        .map { |zone, subnet| [zone, "#{subnet}/#{subnet.prefix}"] }
+        .to_h
+    end
+
+    def layout(*zones)
+      {
+        public: public_layout(*zones),
+        private: private_layout(*zones)
+      }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrap
 version: !ruby/object:Gem::Version
-  version: 0.39.0.pre
+  version: 0.40.0.pre
 platform: ruby
 authors:
 - Chris Olstrom
@@ -230,6 +230,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.8
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 description: 
 email: chris@olstrom.com
 executables:
@@ -257,6 +277,7 @@ files:
 - lib/cloudstrap/config.rb
 - lib/cloudstrap/errors.rb
 - lib/cloudstrap/hdp/bootstrap_properties.rb
+- lib/cloudstrap/network.rb
 - lib/cloudstrap/seed_properties.rb
 - lib/cloudstrap/ssh.rb
 - lib/cloudstrap/ssh/client.rb