bosh-cloudfoundry 0.7.0.alpha.6 → 0.7.0.alpha.7

data/README.md

@@ -14,22 +14,71 @@ $ bosh delete cf
 
 The deployed Cloud Foundry does not include any data or messaging services for the user applications. These are available as add-ons coming soon.
 
-[![Build Status](https://travis-ci.org/StarkAndWayne/bosh-cloudfoundry.png?branch=v0.7)](https://travis-ci.org/StarkAndWayne/bosh-cloudfoundry)
+[![Build Status](https://travis-ci.org/cloudfoundry-community/bosh-cloudfoundry.png?branch=v0.7)](https://travis-ci.org/StarkAndWayne/bosh-cloudfoundry) [![Stories in Ready](http://badge.waffle.io/cloudfoundry-community/bosh-cloudfoundry.png)](http://waffle.io/cloudfoundry-community/bosh-cloudfoundry)
+
+## What gets created?
+
+The amount of resources used to run Cloud Foundry is determined by the `--deployment-size` you choose (defaults to medium) and the scale you grow it to over time.
+
+Currently there are two deployment sizes supported: medium & large.
+
+For a medium deployment the following VMs are created and have the following vitals after creation:
+
+```
+$ bosh create cf ... --deployment-size medium
+$ bosh vms --vitals
++-----------+---------+---------------+-------------------------------+-----------------------+------+------+------+----------------+------------+------------+------------+------------+
+| Job/index | State   | Resource Pool | IPs                           |         Load          | CPU  | CPU  | CPU  | Memory Usage   | Swap Usage | System     | Ephemeral  | Persistent |
+|           |         |               |                               | (avg01, avg05, avg15) | User | Sys  | Wait |                |            | Disk Usage | Disk Usage | Disk Usage |
++-----------+---------+---------------+-------------------------------+-----------------------+------+------+------+----------------+------------+------------+------------+------------+
+| api/0     | running | small         | 10.159.35.150, 54.225.102.129 | 0.06%, 0.08%, 0.13%   | 0.1% | 0.2% | 0.0% | 13.7% (227.8M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| core/0    | running | small         | 10.118.153.76                 | 1.25%, 0.87%, 0.35%   | 0.0% | 0.0% | 0.1% | 23.6% (391.7M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| data/0    | running | small         | 10.158.26.49                  | 0.02%, 0.02%, 0.07%   | 0.0% | 0.0% | 0.2% | 7.1% (118.9M)  | 0.0% (0B)  | 49%        | 1%         | 4%         |
+| dea/0     | running | small         | 10.235.53.185                 | 0.07%, 0.07%, 0.06%   | 0.1% | 0.2% | 0.0% | 19.2% (319.8M) | 0.0% (0B)  | 49%        | 2%         | n/a        |
+| uaa/0     | running | small         | 10.29.186.245                 | 0.09%, 0.10%, 0.08%   | 0.1% | 0.0% | 0.1% | 28.3% (469.7M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
++-----------+---------+---------------+-------------------------------+-----------------------+------+------+------+----------------+------------+------------+------------+------------+
+```
+
+For a large deployment, all jobs (moving parts) of Cloud Foundry are isolated into their own VMs, and it includes a syslog aggregator:
+
+```
+$ bosh create cf ... --deployment-size large
+$ bosh vms --vitals
++---------------------+---------+---------------+------------------------------+-----------------------+------+------+-------+----------------+------------+------------+------------+------------+
+| Job/index           | State   | Resource Pool | IPs                          |         Load          | CPU  | CPU  | CPU   | Memory Usage   | Swap Usage | System     | Ephemeral  | Persistent |
+|                     |         |               |                              | (avg01, avg05, avg15) | User | Sys  | Wait  |                |            | Disk Usage | Disk Usage | Disk Usage |
++---------------------+---------+---------------+------------------------------+-----------------------+------+------+-------+----------------+------------+------------+------------+------------+
+| cloud_controller/0  | running | small         | 10.152.174.25                | 0.15%, 0.12%, 0.08%   | 0.0% | 0.0% | 0.3%  | 11.0% (183.2M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| dea/0               | running | large         | 10.144.83.102                | 0.80%, 0.36%, 0.15%   | 0.0% | 0.0% | 0.0%  | 5.3% (400.5M)  | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| health_manager/0    | running | small         | 10.147.214.194               | 0.07%, 0.12%, 0.13%   | 0.0% | 0.0% | 0.2%  | 7.1% (118.4M)  | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| login/0             | running | small         | 10.144.157.79                | 0.06%, 0.27%, 0.17%   | 0.0% | 0.0% | 0.2%  | 18.9% (313.8M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| nats/0              | running | small         | 10.152.188.72                | 0.04%, 0.14%, 0.13%   | 0.0% | 0.0% | 0.0%  | 5.9% (98.0M)   | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| nfs_server/0        | running | small         | 10.164.22.218                | 0.03%, 0.09%, 0.09%   | 0.0% | 0.0% | 15.5% | 5.2% (87.8M)   | 0.0% (0B)  | 49%        | 1%         | 1%         |
+| postgres/0          | running | small         | 10.154.152.54                | 0.25%, 0.17%, 0.12%   | 0.0% | 0.1% | 0.1%  | 6.7% (111.2M)  | 0.0% (0B)  | 49%        | 1%         | 1%         |
+| router/0            | running | small         | 10.164.87.23, 54.225.102.129 | 0.04%, 0.09%, 0.07%   | 0.0% | 0.0% | 0.7%  | 5.6% (93.0M)   | 0.0% (0B)  | 49%        | 1%         | n/a        |
+| syslog_aggregator/0 | running | small         | 10.165.35.246                | 0.00%, 0.14%, 0.14%   | 0.0% | 0.0% | 0.8%  | 6.3% (105.0M)  | 0.0% (0B)  | 49%        | 1%         | 1%         |
+| uaa/0               | running | small         | 10.165.13.230                | 0.11%, 0.59%, 0.38%   | 0.0% | 0.0% | 0.0%  | 29.6% (491.4M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
++---------------------+---------+---------------+------------------------------+-----------------------+------+------+-------+----------------+------------+------------+------------+------------+
+```
 
 ## Requirements
 
-You must use the same BOSH for deploying redis as you use to deploy Cloud Foundry (unless your DNS is configured to be shared across the two BOSH).
+You will also need an IP address, and a wildcard DNS A record that points to the IP address.
 
-It is also required that you have login access to the same BOSH being used to deploy your Cloud Foundry.
+It is also required that you have login access to a BOSH on AWS EC2 or OpenStack (please help with vSphere support).
 
 Confirm this by running:
 
 ```
 $ bosh status
-$ bosh deployments
 ```
 
-The former will confirm you are targeting a bosh. The latter will display the deployments. One of which should be your Cloud Foundry.
+To create your own BOSH on AWS or OpenStack:
+
+```
+$ gem install bosh-bootstrap
+$ bosh-bootstrap deploy
+```
 
 ## Installation
 
@@ -67,14 +116,29 @@ NOTE: By default, the `default` security group is used.
 You will be prompted to confirm that your chosen/default security group has ports `22`, `80`, `443` and `4222` open. To chose a different security group, use the `--security-group` option:
 
 ```
-$ bosh create redis --security-group cf-core
+$ bosh create cf --security-group cf-core
 ```
 
 * TODO - how to show available instance sizes
 * TODO - how to update Cloud Foundry servers to a different instance size/flavor
-* TODO - how to scale from a small deployment to a large deployment
 * TODO - how to update the persistent disks of the deployment
 
+## Initializing Cloud Foundry
+
+Once Cloud Foundry is up and running, follow these steps to login (and discover your password) and create an initial organization and space:
+
+```
+$ cf target api.mycloud.com
+$ bosh show cf passwords
+Common password: 6d7fe84f828b
+$ cf login admin
+Password> 6d7fe84f828b
+
+$ cf create-org me
+$ cf create-space production
+$ cf switch-space production
+```
+
 ## Releasing new plugin gem versions
 
 There are two reasons to release new versions of this plugin.

data/bosh-cloudfoundry.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh-cloudfoundry"
-  spec.version       = "0.7.0.alpha.6"
+  spec.version       = "0.7.0.alpha.7"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create & manage Cloud Foundry deployments}
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "bosh_cli", "~> 1.5.0.pre"
+  spec.add_dependency "net-dns"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/bosh/cli/commands/cf.rb

@@ -77,6 +77,8 @@ module Bosh::Cli::Command
         attrs.validate(:deployment_size)
       end
 
+      validate_dns_mapping
+
       unless confirmed?("Security group #{attrs.validated_color(:security_group)} exists with ports #{attrs.required_ports.join(", ")}")
         cancel_deployment
       end
@@ -97,13 +99,21 @@ module Bosh::Cli::Command
       end
     end
 
-    usage "show cf passwords"
-    desc "display the internal passwords for deployment"
-    def show_cf_passwords
-
+    usage "show cf properties"
+    desc "display the deployment properties, indicate which are changable"
+    def show_cf_properties
       setup_deployment_attributes
       reconstruct_deployment_file
-      say "Common password: #{attrs.validated_color(:common_password)}"
+      nl
+      say "Immutable properties:"
+      attrs.immutable_attributes.each do |attr_name|
+        say "#{attr_name}: #{attrs.validated_color(attr_name.to_sym)}"
+      end
+      nl
+      say "Mutable (changable) properties:"
+      attrs.mutable_attributes.each do |attr_name|
+        say "#{attr_name}: #{attrs.validated_color(attr_name.to_sym)}"
+      end
     end
 
     protected
@@ -182,5 +192,9 @@ module Bosh::Cli::Command
       end
       cmd
     end
+
+    def validate_dns_mapping
+      attrs.validate_dns_mapping
+    end
   end
 end

data/lib/bosh/cloudfoundry.rb

@@ -3,8 +3,12 @@ module Bosh; module Cloudfoundry; end; end
 require "cli/core_ext"
 require "cli/validation"
 
+# For SecureRandom.hex
+require "securerandom"
+
 require "bosh/cloudfoundry/release_version"
 require "bosh/cloudfoundry/release_version_cpi"
 require "bosh/cloudfoundry/release_version_cpi_size"
 require "bosh/cloudfoundry/deployment_attributes"
-require "bosh/cloudfoundry/deployment_file"
+require "bosh/cloudfoundry/deployment_file"
+require "bosh/cloudfoundry/validations"

data/lib/bosh/cloudfoundry/deployment_attributes.rb

@@ -6,12 +6,12 @@ module Bosh::Cloudfoundry
     include Bosh::Cli::Validation
 
     attr_reader :attributes
-    attr_reader :released_version_cpi
+    attr_reader :release_version_cpi
 
-    def initialize(director_client, bosh_status, released_version_cpi, attributes = {})
+    def initialize(director_client, bosh_status, release_version_cpi, attributes = {})
       @director_client = director_client
       @bosh_status = bosh_status
-      @released_version_cpi = released_version_cpi
+      @release_version_cpi = release_version_cpi
       @attributes = attributes
       @attributes[:name] ||= default_name
       @attributes[:deployment_size] ||= default_deployment_size
@@ -36,6 +36,10 @@ module Bosh::Cloudfoundry
       @attributes[:security_group]
     end
 
+    def common_password
+      @attributes[:common_password]
+    end
+
     def ip_addresses
       @attributes[:ip_addresses]
     end
@@ -44,6 +48,20 @@ module Bosh::Cloudfoundry
       @attributes[:dns]
     end
 
+    def available_attributes
+      @attributes.keys
+    end
+
+    # Attributes & their values that can be changed via setters & deployment re-deployed successfully
+    def mutable_attributes
+      release_version_cpi.mutable_attributes
+    end
+
+    # Attributes & their values that are not to be changed over time
+    def immutable_attributes
+      release_version_cpi.immutable_attributes
+    end
+
     def set_unless_nil(attribute, value)
       attributes[attribute.to_sym] = value if value
     end
@@ -63,6 +81,25 @@ module Bosh::Cloudfoundry
       end
     end
 
+    # FIXME only supports a single ip_address
+    def validate_dns_mapping
+      validate_dns_a_record("api.#{dns}", ip_addresses.first)
+      validate_dns_a_record("demoapp.#{dns}", ip_addresses.first)
+    end
+
+    def validate_dns_a_record(domain, expected_ip_address)
+      dns_mapping = Bosh::Cloudfoundry::Validations::DnsIpMappingValidation.new(domain, expected_ip_address)
+      if dns_mapping.valid?
+        say "`#{dns_mapping.domain}' maps to #{dns_mapping.ip_address}".make_green
+      else
+        say "Validation errors:"
+        dns_mapping.errors.each do |error|
+          say "- %s" % [error]
+        end
+        err "`#{dns_mapping.domain}' does not map to #{dns_mapping.ip_address}"
+      end
+    end
+
     def format(attribute)
       value = attributes[attribute.to_sym].to_s
     end
@@ -76,18 +113,18 @@ module Bosh::Cloudfoundry
     # TODO move these validations into a "ValidatedSize" class or similar
     def available_resources
       @available_resources ||= begin
-        resources = released_version_cpi.spec["resources"]
+        resources = release_version_cpi.spec["resources"]
         if resources && resources.is_a?(Array) && resources.first.is_a?(String)
           resources
         else
-          err "template spec needs 'resources' key with list of resource pool names available; found #{released_version_cpi.spec.inspect}"
+          err "template spec needs 'resources' key with list of resource pool names available; found #{release_version_cpi.spec.inspect}"
         end
       end
     end
 
     def available_deployment_sizes
       @available_deployment_sizes ||= begin
-        deployment_sizes = released_version_cpi.spec["deployment_sizes"]
+        deployment_sizes = release_version_cpi.spec["deployment_sizes"]
         if deployment_sizes && deployment_sizes.is_a?(Array) && deployment_sizes.first.is_a?(String)
           deployment_sizes
         else

data/lib/bosh/cloudfoundry/release_version.rb

@@ -46,6 +46,24 @@ module Bosh::Cloudfoundry
       @release_name = "cf-release" # TODO determine from release file
     end
 
+    # Attributes & their values that can be changed via setters & deployment re-deployed successfully
+    def mutable_attributes
+      spec["mutable_attributes"]
+    end
+
+    # Attributes & their values that are not to be changed over time
+    def immutable_attributes
+      spec["immutable_attributes"]
+    end
+
+    def available_cpi_names
+      spec["available_cpi"]
+    end
+
+    def valid_cpi?(cpi)
+      available_cpi_names.include?(cpi)
+    end
+
     def self.base_template_dir
       File.expand_path("../../../../templates", __FILE__)
     end
@@ -54,14 +72,13 @@ module Bosh::Cloudfoundry
       File.join(self.class.base_template_dir, "v#{version_number}")
     end
 
-    def available_cpi_names
-      @available_cpi_names ||= begin
-        Dir[File.join(template_dir, "*")].map {|dir| File.basename(dir)}
-      end
+    def spec_path
+      File.join(template_dir, "spec")
     end
 
-    def valid_cpi?(cpi)
-      available_cpi_names.include?(cpi)
+    def spec
+      @spec ||= YAML.load_file(spec_path)
     end
+
   end
 end

data/lib/bosh/cloudfoundry/release_version_cpi.rb

@@ -33,7 +33,7 @@ module Bosh::Cloudfoundry
     end
 
     def spec
-      YAML.load_file(spec_path)
+      @spec ||= YAML.load_file(spec_path)
     end
 
     def available_deployment_sizes
@@ -51,5 +51,15 @@ module Bosh::Cloudfoundry
     def release_version_number
       release_version.version_number
     end
+
+    # Attributes & their values that can be changed via setters & deployment re-deployed successfully
+    def mutable_attributes
+      release_version.mutable_attributes
+    end
+
+    # Attributes & their values that are not to be changed over time
+    def immutable_attributes
+      release_version.immutable_attributes
+    end
   end
 end

data/lib/bosh/cloudfoundry/validations.rb

@@ -0,0 +1 @@
+require "bosh/cloudfoundry/validations/dns_ip_mapping_validation"

data/lib/bosh/cloudfoundry/validations/dns_ip_mapping_validation.rb

@@ -0,0 +1,53 @@
+# for validating DNS -> IP setups
+require 'net/dns'
+
+module Bosh::Cloudfoundry::Validations
+  # Validates that +domain+ is an A record that resolves to +expected_ip_addresses+
+  # and no other IP addresses.
+  #
+  # Usage:
+  #
+  #   dns_mapping = Bosh::Cloudfoundry::Validations::DnsIpMappingValidation.new("foobar.mycloud.com", "1.2.3.4")
+  #   if dns_mapping.valid?
+  #     puts "`#{dns_mapping.domain}' maps to #{dns_mapping.ip_address}"
+  #   else
+  #     puts "Validation errors:"
+  #     dns_mapping.errors.each do |error|
+  #       puts "- %s" % [error]
+  #     end
+  #     puts "`#{dns_mapping.domain}' does not map to #{dns_mapping.ip_address}"
+  #   end
+  class DnsIpMappingValidation
+    include Bosh::Cli::Validation
+    include BoshExtensions
+
+    attr_reader :domain
+    attr_reader :ip_address
+
+    def initialize(domain, ip_address)
+      @domain = domain
+      @ip_address = ip_address
+    end
+
+    def perform_validation(options={})
+      resolved_a_records = nil
+      step("Resolve DNS",
+           "Cannot resolve DNS '#{domain}' to an IP address", :fatal) do
+         any_resolved_records, resolved_a_records = resolve_dns(domain)
+         any_resolved_records
+      end
+
+      step("Resolve DNS '#{domain}' to IP '#{ip_address}'",
+            "DNS '#{domain}' resolves to: #{resolved_a_records.join(', ')}") do
+        resolved_a_records == [ip_address]
+      end
+    end
+
+    protected
+    def resolve_dns(domain)
+      packet = Net::DNS::Resolver.start(domain, Net::DNS::A)
+      resolved_a_records = packet.answer.map(&:value)
+      [(packet.answer.size > 0), resolved_a_records]
+    end
+  end
+end

data/spec/assets/v133/aws/medium.yml

@@ -33,7 +33,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 4
+    size: 5
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -42,7 +42,7 @@ resource_pools:
 
   - name: medium
     network: default
-    size: 1
+    size: 0
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -75,7 +75,7 @@ jobs:
       - collector
       - login
     instances: 1
-    resource_pool: medium
+    resource_pool: small
     networks:
     - name: default
       default:

data/spec/deployment_attributes_spec.rb

@@ -0,0 +1,51 @@
+describe Bosh::Cloudfoundry::DeploymentAttributes do
+  let(:director) { instance_double("Bosh::Cli::Director") }
+  let(:bosh_status) { {"cpi" => "aws", "uuid" => "uuid"} }
+  let(:release_version_cpi) { instance_double("Bosh::Cloudfoundry::ReleaseVersionCpi")}
+
+  before { SecureRandom.stub(:hex).and_return("qwertyqwerty") }
+
+  context "default value" do
+    subject { Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi) }
+    it { subject.deployment_size.should == "medium" }
+    it { subject.persistent_disk.should == 4096 }
+    it { subject.security_group.should == "default" }
+    it { subject.common_password.should == "qwertyqwerty" }
+  end
+
+  context "attributes" do
+    it "returns default attributes" do
+      subject = Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi)
+      subject.available_attributes.sort.should ==
+        %w[common_password deployment_size name persistent_disk security_group].map(&:to_sym)
+    end
+
+    it "returns additional attributes" do
+      subject = Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi, {
+        dns: "mycloud.com", ip_addresses: ["1.2.3.4"]
+      })
+      subject.available_attributes.sort.should ==
+        %w[common_password deployment_size dns ip_addresses name persistent_disk security_group].map(&:to_sym)
+    end
+
+    # immutable_attributes ultimately determined by ReleaseVersion (from templates/vXYZ/spec)
+    it "immutable_attributes derived from release_version[_cpi]" do
+      immutable_attributes = %w[common_password deployment_size dns name].map(&:to_sym)
+      release_version_cpi.should_receive(:immutable_attributes).and_return(immutable_attributes)
+      subject = Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi, {
+        dns: "mycloud.com", ip_addresses: ["1.2.3.4"]
+      })
+      subject.immutable_attributes.should == immutable_attributes
+    end
+
+    # mutable_attributes ultimately determined by ReleaseVersion (from templates/vXYZ/spec)
+    it "mutable_attributes derived from release_version[_cpi]" do
+      mutable_attributes = %w[ip_addresses persistent_disk security_group].map(&:to_sym)
+      release_version_cpi.should_receive(:mutable_attributes).and_return(mutable_attributes)
+      subject = Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi, {
+        dns: "mycloud.com", ip_addresses: ["1.2.3.4"]
+      })
+      subject.mutable_attributes.should == mutable_attributes
+    end
+  end
+end

data/spec/plugin_spec.rb

@@ -78,6 +78,7 @@ describe Bosh::Cli::Command::CloudFoundry do
         command.add_option(:common_password, "qwertyasdfgh")
 
         command.should_receive(:auth_required)
+        command.should_receive(:validate_dns_mapping)
 
         director = instance_double("Bosh::Cli::Director")
         director.should_receive(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
@@ -97,11 +98,11 @@ describe Bosh::Cli::Command::CloudFoundry do
 
     end
 
-    it "displays the list of internal passwords" do
+    it "displays the list of attributes/properties" do
       command.add_option(:config, home_file(".bosh_config"))
       command.add_option(:non_interactive, true)
 
-      director = mock("director_client")
+      director = instance_double("Bosh::Cli::Director")
       director.should_receive(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
       command.stub(:director_client).and_return(director)
 
@@ -113,12 +114,20 @@ describe Bosh::Cli::Command::CloudFoundry do
           ],
           "properties" => {
             "cf" => {
-              "common_passwords" => "qwerty"
+              # immutable attributes (determined via ReleaseVersion via templates/vXYZ/spec)
+              "name" => "demo",
+              "deployment_size" => "medium",
+              "dns" => "mycloud.com",
+              "common_password" => "qwerty",
+              # mutable attributes (determined via ReleaseVersion via templates/vXYZ/spec)
+              "ip_addresses" => ["1.2.3.4"],
+              "persistent_disk" => 4096,
+              "security_group" => "cf"
             }
           }
         }.to_yaml
       end
-      command.show_cf_passwords
+      command.show_cf_properties
     end
   end
 

data/spec/validations/dns_ip_mapping_validation_spec.rb

@@ -0,0 +1,24 @@
+describe Bosh::Cloudfoundry::Validations::DnsIpMappingValidation do
+  subject { Bosh::Cloudfoundry::Validations::DnsIpMappingValidation.new("some.domain.com", "1.2.3.4") }
+
+  it "resolves valid DNS -> single IP mapping" do
+    subject.should_receive(:resolve_dns).with("some.domain.com").and_return([true, ["1.2.3.4"]])
+    subject.validate
+    subject.should be_valid
+    subject.errors.should == []
+  end
+
+  it "fails to resolve invalid DNS -> single IP mapping" do
+    subject.should_receive(:resolve_dns).with("some.domain.com").and_return([false, []])
+    subject.validate
+    subject.should_not be_valid
+    subject.errors.should == ["Cannot resolve DNS 'some.domain.com' to an IP address"]
+  end
+
+  it "resolves DNS to a different IP" do
+    subject.should_receive(:resolve_dns).with("some.domain.com").and_return([true, ["6.6.6.6"]])
+    subject.validate
+    subject.should_not be_valid
+    subject.errors.should == ["DNS 'some.domain.com' resolves to: 6.6.6.6"]
+  end
+end

data/templates/v132/spec

@@ -0,0 +1,14 @@
+---
+available_cpi:
+- aws
+- openstack
+
+mutable_attributes:
+- ip_addresses
+- persistent_disk
+- security_group
+immutable_attributes:
+- common_password
+- deployment_size
+- dns
+- name

data/templates/v133/aws/medium/deployment_file.yml.erb

@@ -68,7 +68,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 4
+    size: 5
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -77,7 +77,7 @@ resource_pools:
 
   - name: medium
     network: default
-    size: 1
+    size: 0
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -110,7 +110,7 @@ jobs:
       - collector
       - login
     instances: 1
-    resource_pool: medium
+    resource_pool: small
     networks:
     - name: default
       default:

data/templates/v133/openstack/medium/deployment_file.yml.erb

@@ -68,7 +68,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 4
+    size: 5
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -77,7 +77,7 @@ resource_pools:
 
   - name: medium
     network: default
-    size: 1
+    size: 0
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -110,7 +110,7 @@ jobs:
       - collector
       - login
     instances: 1
-    resource_pool: medium
+    resource_pool: small
     networks:
     - name: default
       default:

data/templates/v133/spec

@@ -0,0 +1,14 @@
+---
+available_cpi:
+- aws
+- openstack
+
+mutable_attributes:
+- ip_addresses
+- persistent_disk
+- security_group
+immutable_attributes:
+- common_password
+- deployment_size
+- dns
+- name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.6
+  version: 0.7.0.alpha.7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0.pre
+- !ruby/object:Gem::Dependency
+  name: net-dns
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -424,16 +440,20 @@ files:
 - lib/bosh/cloudfoundry/release_version.rb
 - lib/bosh/cloudfoundry/release_version_cpi.rb
 - lib/bosh/cloudfoundry/release_version_cpi_size.rb
+- lib/bosh/cloudfoundry/validations.rb
+- lib/bosh/cloudfoundry/validations/dns_ip_mapping_validation.rb
 - spec/assets/v132/aws/large.yml
 - spec/assets/v132/aws/medium.yml
 - spec/assets/v133/aws/large.yml
 - spec/assets/v133/aws/medium.yml
+- spec/deployment_attributes_spec.rb
 - spec/deployment_file_spec.rb
 - spec/plugin_spec.rb
 - spec/release_version_cpi_size_spec.rb
 - spec/release_version_cpi_spec.rb
 - spec/release_version_spec.rb
 - spec/spec_helper.rb
+- spec/validations/dns_ip_mapping_validation_spec.rb
 - templates/README.md
 - templates/v132/aws/large/deployment_file.yml.erb
 - templates/v132/aws/large/spec
@@ -446,6 +466,7 @@ files:
 - templates/v132/openstack/medium/deployment_file.yml.erb
 - templates/v132/openstack/medium/spec
 - templates/v132/openstack/spec
+- templates/v132/spec
 - templates/v133/aws/large/deployment_file.yml.erb
 - templates/v133/aws/large/spec
 - templates/v133/aws/medium/deployment_file.yml.erb
@@ -457,6 +478,7 @@ files:
 - templates/v133/openstack/medium/deployment_file.yml.erb
 - templates/v133/openstack/medium/spec
 - templates/v133/openstack/spec
+- templates/v133/spec
 homepage: ''
 licenses:
 - MIT
@@ -472,7 +494,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4430002613479451948
+      hash: -1355577384199561262
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -490,9 +512,11 @@ test_files:
 - spec/assets/v132/aws/medium.yml
 - spec/assets/v133/aws/large.yml
 - spec/assets/v133/aws/medium.yml
+- spec/deployment_attributes_spec.rb
 - spec/deployment_file_spec.rb
 - spec/plugin_spec.rb
 - spec/release_version_cpi_size_spec.rb
 - spec/release_version_cpi_spec.rb
 - spec/release_version_spec.rb
 - spec/spec_helper.rb
+- spec/validations/dns_ip_mapping_validation_spec.rb