bosh-cloudfoundry 0.7.0.alpha.9 → 0.7.0.alpha.10

data/ChangeLog.md

@@ -19,5 +19,6 @@ The rewrite introduces some new implementation/feature concepts:
 * templates are versioned for each final release (unless new templates not required for new release)
 * different sizes of deployments (orders of magnitude), such as small, medium & large: `bosh create cf --deployment-size large`
 * mutable/changable properties (and immutable properties) for each template version: `bosh change cf attributes persistent_disk=8192`
+* can initially use public http://xip.io for DNS and change to custom DNS later: `bosh change cf attributes dns=cf.mycloud.com`
 
 The latter means that new versions of this rubygem can be published that are backwards compatible with aging deployments of Cloud Foundry. There should not be any forced coupling of old `bosh-cloudfoundry` to old `cf-release` final releases.

data/README.md

@@ -6,7 +6,7 @@ Example create/scale/delete scenario:
 
 ```
 $ bosh prepare cf
-$ bosh create cf --dns mycloud.com --public-ip 1.2.3.4
+$ bosh create cf --public-ip 1.2.3.4
 ...
 $ bosh change cf attributes persistent_disk=8192
 ...
@@ -106,12 +106,22 @@ Uploading new cf release to bosh...
 To create/provision a new Cloud Foundry you run the following command. By default, it will select the smallest possible deployment size.
 
 ```
-$ bosh create cf --dns mycloud.com --public-ip 1.2.3.4
-$ bosh create cf --dns mycloud.com --public-ip 1.2.3.4 --size medium
-$ bosh create cf --dns mycloud.com --public-ip 1.2.3.4 --size large
-$ bosh create cf --dns mycloud.com --public-ip 1.2.3.4 --size xlarge
+$ bosh create cf --public-ip 1.2.3.4
+$ bosh create cf --public-ip 1.2.3.4 --size medium
+$ bosh create cf --public-ip 1.2.3.4 --size large
+$ bosh create cf --public-ip 1.2.3.4 --size xlarge
 ```
 
+It is strongly recommended that you provide your own domain, such as `mycloud.com`. You can purchase and manage your domain through any DNS provider (see below for what needs to be setup), such as [dnsimple.com](https://dnsimple.com/r/af515bc1b6ffc9) (the beloved DNS manager used by Stark & Wayne; as a bonus its an affiliate link so Dr Nic gets free stuff).
+
+To specify a domain:
+
+```
+$ bosh create cf --domain mycloud.com --public-ip 1.2.3.4
+```
+
+By default, it will configure you to use http://xip.io (a lovely service sponsored by 37signals). You root domain will be `1.2.3.4.xip.io` (where `1.2.3.4` is your IP address).
+
 By default the core Cloud Foundry server is assigned a 4096 Mb persistent volume/disk. This can be changed later as your Cloud Foundry deployment grows.
 
 NOTE: By default, the `default` security group is used.
@@ -154,6 +164,22 @@ $ bosh change cf attributes persistent_disk=8192
 
 The initial size of persistent disks is `4096` (4Gb).
 
+## DNS
+
+It is strongly suggested to provide a custom DNS (rather than rely on the free http://xip.io service) as the default DNS for all your applications (including the public API "cloud controller").
+
+You can use the root domain (such as `mycloud.com`) or a subdomain (such as `cf.mycloud.com`).
+
+If you use the [dnsimple.com](https://dnsimple.com/r/af515bc1b6ffc9) service (the beloved DNS manager used by Stark & Wayne; as a bonus it is an affiliate link so Dr Nic gets free stuff) then you will set up your DNS as follows:
+
+<a href="https://dnsimple.com/r/af515bc1b6ffc9"><img src=https://www.evernote.com/shard/s3/sh/a5d22b7e-efef-4c4d-abf6-bac0d343f260/21a09151a6da40e189db349107e6baf0/deep/0/drniccloud.com%20Records%20-%20DNSimple.png /></a>
+
+If you have already deployed Cloud Foundry using the default xip.io DNS service, you can upgrade your Cloud Foundry deployment to use your new custom DNS:
+
+```
+$ bosh change cf attributes dns=cf.mycloud.com
+```
+
 ## 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.9"
+  spec.version       = "0.7.0.alpha.10"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create & manage Cloud Foundry deployments}

data/lib/bosh/cli/commands/02_create_cf.rb

@@ -26,11 +26,8 @@ module Bosh::Cli::Command
       err("Only one IP address is supported currently. Please create an issue to mention you need more.") if ip_addresses.size > 1
       attrs.set(:ip_addresses, ip_addresses)
 
-      dns = options[:dns]
-      err("USAGE: bosh create cf --dns mycloud.com -- please provide a base DNS that has a '*' A record referencing IPs") unless dns
-      attrs.set(:dns, dns)
-
       attrs.set_unless_nil(:name, options[:name])
+      attrs.set_unless_nil(:dns, options[:dns])
       attrs.set_unless_nil(:persistent_disk, options[:disk])
       attrs.set_unless_nil(:security_group, options[:security_group])
       attrs.set_unless_nil(:common_password, options[:common_password])

data/lib/bosh/cloudfoundry/deployment_attributes.rb

@@ -72,11 +72,16 @@ module Bosh::Cloudfoundry
 
     def set(attribute, value)
       attributes[attribute.to_sym] = value
+
+      case attribute.to_sym
+      when :ip_addresses
+        set_default_dns
+      end
     end
 
     def set_mutable(attribute, value)
       if mutable_attribute?(attribute)
-        attributes[attribute.to_sym] = value
+        set(attribute, value)
       else
         false
       end
@@ -186,6 +191,13 @@ module Bosh::Cloudfoundry
       "default"
     end
 
+    def set_default_dns
+      if dns.nil?
+        first_ip_address = ip_addresses.first
+        set(:dns, "#{first_ip_address}.xip.io")
+      end
+    end
+
     def bosh_uuid
       @bosh_status["uuid"]
     end

data/spec/commands/command_create_cf_spec.rb

@@ -19,7 +19,6 @@ describe Bosh::Cli::Command::CloudFoundry do
             # 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"],
@@ -49,24 +48,18 @@ describe Bosh::Cli::Command::CloudFoundry do
         director.stub(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
         command.stub(:director).and_return(director)
       end
+
       it "requires --ip 1.2.3.4" do
         command.add_option(:dns, "mycloud.com")
         command.add_option(:size, "xlarge")
         expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
       end
-
-      it "requires --dns" do
-        command.add_option(:ip, ["1.2.3.4"])
-        command.add_option(:size, "xlarge")
-        expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
-      end
     end
 
     context "with requirements" do
       it "creates cf deployment" do
         command.add_option(:name, "demo")
         command.add_option(:ip, ["1.2.3.4"])
-        command.add_option(:dns, "mycloud.com")
         command.add_option(:common_password, "qwertyasdfgh")
 
         command.should_receive(:auth_required)
@@ -84,7 +77,6 @@ describe Bosh::Cli::Command::CloudFoundry do
 
         command.create_cf
       end
-
     end
   end
   

data/spec/deployment_attributes_spec.rb

@@ -13,6 +13,24 @@ describe Bosh::Cloudfoundry::DeploymentAttributes do
     it { subject.common_password.should == "qwertyqwerty" }
   end
 
+  context "delayed default values" do
+    subject { Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi) }
+    it "dns nil default until ip_addresses set" do
+      subject.dns.should be_nil
+    end
+
+    it "dns defaults to FIRST_IP_ADDRESS.xip.io if ip_addresses has 1+ addresses" do
+      subject.set(:ip_addresses, ["1.2.3.4"])
+      subject.dns.should == "1.2.3.4.xip.io"
+    end
+
+    it "dns has custom value if set" do
+      subject.set(:ip_addresses, ["1.2.3.4"])
+      subject.set(:dns, "mycloud.com")
+      subject.dns.should == "mycloud.com"
+    end
+  end
+
   context "attributes" do
     it "returns default attributes" do
       subject = Bosh::Cloudfoundry::DeploymentAttributes.new(director, bosh_status, release_version_cpi)

data/templates/v132/spec

@@ -7,8 +7,8 @@ mutable_attributes:
 - ip_addresses
 - persistent_disk
 - security_group
+- dns
 immutable_attributes:
 - common_password
 - deployment_size
-- dns
 - name

data/templates/v133/spec

@@ -7,8 +7,8 @@ mutable_attributes:
 - ip_addresses
 - persistent_disk
 - security_group
+- dns
 immutable_attributes:
 - common_password
 - deployment_size
-- dns
 - name

data/templates/v134/spec

@@ -7,8 +7,8 @@ mutable_attributes:
 - ip_addresses
 - persistent_disk
 - security_group
+- dns
 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.9
+  version: 0.7.0.alpha.10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -513,7 +513,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2813545994719294893
+      hash: 1135814561112793357
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: