bosh-bootstrap 0.8.2 → 0.9.0

data/spec/unit/aws_spec.rb

@@ -23,7 +23,6 @@ describe "AWS deployment" do
     setting "inception.create_new", true
     setting "bosh_username", "testuser"
     setting "bosh_password", "testpass"
-    setting "bosh.password", "testpass"
     setting "fog_credentials", @fog_credentials.stringify_keys
     setting "bosh.salted_password", "pepper"
     setting "bosh.persistent_disk", 16384
@@ -65,7 +64,7 @@ describe "AWS deployment" do
     @cmd.should_receive(:provision_and_mount_volume)
     @cmd.stub(:run_server).and_return(true)
     @cmd.stub(:sleep)
-    @cmd.should_receive(:deploy_stage_6_setup_new_bosh)
+    @cmd.should_receive(:deploy_stage_7_setup_new_bosh)
     @cmd.deploy
 
     fog.addresses.should have(1).item # assigned to inception VM
@@ -85,7 +84,7 @@ describe "AWS deployment" do
     # TODO - fix fog so we can test private_ip_address
     # inception.private_ip_address.should == "10.0.0.5"
 
-    fog.security_groups.should have(2).item
+    fog.security_groups.should have(3).item
 
     fog.internet_gateways.should have(1).item
     ig = fog.internet_gateways.first
@@ -104,6 +103,7 @@ describe "AWS deployment" do
 
     inception_server = fog.servers.first
     inception_server.dns_name.should == settings["inception"]["host"]
+    inception_server.groups.should == [settings["inception"]["security_group"]]
 
     public_ip = settings["bosh"]["ip_address"]
     public_ip.should == "10.0.0.6"
@@ -118,10 +118,13 @@ describe "AWS deployment" do
     @cmd.should_receive(:provision_and_mount_volume)
     @cmd.stub(:run_server).and_return(true)
     @cmd.stub(:sleep)
-    @cmd.should_receive(:deploy_stage_6_setup_new_bosh)
+    @cmd.should_receive(:deploy_stage_7_setup_new_bosh)
     @cmd.deploy
     @settings = nil # reload settings file
 
+    # TODO we are temporarily using prebuilt stemcells by default for AWS
+    settings["micro_bosh_stemcell_type"].should == "edge-prebuilt"
+
     fog.addresses.should have(2).item
     inception_ip_address = fog.addresses.first
     inception_ip_address.domain.should == "standard"
@@ -135,7 +138,6 @@ describe "AWS deployment" do
     fog.key_pairs.should have(2).item
 
     settings["inception"].should_not be_nil
-    p settings["inception"]
     settings["inception"]["key_pair"].should_not be_nil
     settings["inception"]["key_pair"]["name"].should_not be_nil
     settings["inception"]["key_pair"]["private_key"].should_not be_nil
@@ -144,10 +146,30 @@ describe "AWS deployment" do
 
     fog.vpcs.should have(0).item
     fog.servers.should have(1).item
-    fog.security_groups.should have(2).item
+    fog.security_groups.should have(3).item
 
     inception_server = fog.servers.first
     inception_server.dns_name.should == settings["inception"]["host"]
+    inception_server.groups.should == [settings["inception"]["security_group"]]
+    
+    public_ip = settings["bosh"]["ip_address"]
+    manifest_path = spec_asset("micro_bosh_yml/micro_bosh.aws_ec2.yml")
+    YAML.load(@cmd.micro_bosh_yml).should == expected_manifest_content(manifest_path, public_ip)
+  end
+
+  it "uses pre-built gems and AMIs for us-east-1 created from jenkins" do
+    @cmd.should_receive(:provision_and_mount_volume)
+    @cmd.stub(:run_server).and_return(true)
+    @cmd.stub(:sleep)
+    @cmd.should_receive(:deploy_stage_7_setup_new_bosh)
+    @cmd.should_receive(:latest_prebuilt_microbosh_ami).and_return("ami-123456")
+
+    setting "edge-prebuilt", true
+    @cmd.deploy
+
+    settings["micro_bosh_stemcell_type"].should == "ami"
+    settings["micro_bosh_stemcell_name"].should == "ami-123456"
+
     public_ip = settings["bosh"]["ip_address"]
     manifest_path = spec_asset("micro_bosh_yml/micro_bosh.aws_ec2.yml")
     YAML.load(@cmd.micro_bosh_yml).should == expected_manifest_content(manifest_path, public_ip)

data/spec/unit/bosh/providers/aws_spec.rb

@@ -61,6 +61,20 @@ describe Bosh::Providers do
           }
         ]
       end
+      it "should open a range of ICMP ports" do
+        ports = { ping: { protocol: "icmp", ports: (3..4) } }
+        @aws_provider.create_security_group("sg-range-icmp-name", "sg-range-icmp-name", ports)
+        created_sg = @fog_compute.security_groups.get("sg-range-icmp-name")
+        created_sg.ip_permissions.should == [
+          { 
+            "ipProtocol"=>"icmp",
+            "fromPort"=>3, 
+            "toPort"=>4, 
+            "groups"=>[], 
+            "ipRanges"=>[ { "cidrIp"=>"0.0.0.0/0" } ] 
+          }
+        ]
+      end
       it "should open not open ports if they are already open" do
         @aws_provider.create_security_group("sg2", "", { ssh: { protocol: "udp", ports: (60000..600050) } })
         @aws_provider.create_security_group("sg2", "", { ssh: { protocol: "udp", ports: (60010..600040) } })

data/spec/unit/cli_spec.rb

@@ -20,8 +20,9 @@ describe Bosh::Bootstrap do
       deploy_stage_2_bosh_configuration
       deploy_stage_3_create_allocate_inception_vm
       deploy_stage_4_prepare_inception_vm
-      deploy_stage_5_deploy_micro_bosh
-      deploy_stage_6_setup_new_bosh
+      deploy_stage_5_salted_password
+      deploy_stage_6_deploy_micro_bosh
+      deploy_stage_7_setup_new_bosh
     ]
     stage_methods.each do |method|
       unless method =~ /#{stage}/
@@ -41,8 +42,9 @@ describe Bosh::Bootstrap do
       @cmd.should_receive(:deploy_stage_2_bosh_configuration)
       @cmd.should_receive(:deploy_stage_3_create_allocate_inception_vm)
       @cmd.should_receive(:deploy_stage_4_prepare_inception_vm)
-      @cmd.should_receive(:deploy_stage_5_deploy_micro_bosh)
-      @cmd.should_receive(:deploy_stage_6_setup_new_bosh)
+      @cmd.should_receive(:deploy_stage_5_salted_password)
+      @cmd.should_receive(:deploy_stage_6_deploy_micro_bosh)
+      @cmd.should_receive(:deploy_stage_7_setup_new_bosh)
       @cmd.deploy
     end
 
@@ -66,8 +68,8 @@ describe Bosh::Bootstrap do
       @cmd.deploy
     end
 
-    it "stage 5 - download stemcell and deploy microbosh" do
-      testing_stage(5)
+    it "stage 6 - download stemcell and deploy microbosh" do
+      testing_stage(6)
       @cmd.should_receive(:recreate_local_ssh_keys_for_inception_vm)
       setting "bosh_provider", "aws"
       setting "micro_bosh_stemcell_name", "micro-bosh-stemcell-aws-0.8.1.tgz"
@@ -84,8 +86,8 @@ describe Bosh::Bootstrap do
       @cmd.deploy
     end
 
-    it "stage 6 - sets up new microbosh" do
-      testing_stage(6)
+    it "stage 7 - sets up new microbosh" do
+      testing_stage(7)
       setting "bosh_name", "microbosh-aws-us-east-1"
       setting "bosh_username", "drnic"
       setting "bosh_password", "password"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -261,16 +261,18 @@ files:
 - lib/bosh-bootstrap/stages/stage_micro_bosh_deploy/install_key_pair_for_user
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm.rb
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/configure_git
-- lib/bosh-bootstrap/stages/stage_prepare_inception_vm/convert_salted_password
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/create_vcap_user
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_base_packages
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_bosh
+- lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_bosh_by_gem_install
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_bosh_plugins
+- lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_hub
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_ruby
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_useful_gems
 - lib/bosh-bootstrap/stages/stage_prepare_inception_vm/validate_bosh_deployer
+- lib/bosh-bootstrap/stages/stage_salted_password.rb
+- lib/bosh-bootstrap/stages/stage_salted_password/convert_salted_password
 - lib/bosh-bootstrap/stages/stage_setup_new_bosh.rb
-- lib/bosh-bootstrap/stages/stage_setup_new_bosh/cleanup_permissions
 - lib/bosh-bootstrap/stages/stage_setup_new_bosh/setup_bosh_user
 - lib/bosh-bootstrap/stages/stage_validate_inception_vm.rb
 - lib/bosh-bootstrap/stages/stage_validate_inception_vm/validate_ubuntu
@@ -284,7 +286,12 @@ files:
 - spec/assets/bosh/public_stemcells/aws_micro.out
 - spec/assets/micro_bosh_yml/micro_bosh.aws_ec2.yml
 - spec/assets/micro_bosh_yml/micro_bosh.aws_vpc.yml
-- spec/functional/.gitkeep
+- spec/integration/.gitkeep
+- spec/integration/aws/aws_basic_spec.rb
+- spec/integration/aws/aws_edge_prebuilt_ami_spec.rb
+- spec/integration/aws/aws_edge_prebuilt_spec.rb
+- spec/integration/aws/aws_edge_spec.rb
+- spec/integration/aws/aws_helpers.rb
 - spec/spec_helper.rb
 - spec/unit/.gitkeep
 - spec/unit/aws_spec.rb
@@ -293,6 +300,59 @@ files:
 - spec/unit/cli_ssh_spec.rb
 - spec/unit/cli_upgrade_inception_spec.rb
 - spec/unit/settings_setter_spec.rb
+- vendor/cache/POpen4-0.1.4.gem
+- vendor/cache/Platform-0.4.0.gem
+- vendor/cache/activesupport-3.2.8.gem
+- vendor/cache/awesome_print-1.1.0.gem
+- vendor/cache/aws-s3-0.6.3.gem
+- vendor/cache/blobstore_client-0.4.0.gem
+- vendor/cache/bosh_cli-1.0.3.gem
+- vendor/cache/bosh_common-0.5.4.gem
+- vendor/cache/builder-3.1.4.gem
+- vendor/cache/coderay-1.0.8.gem
+- vendor/cache/diff-lcs-1.1.3.gem
+- vendor/cache/escape-0.0.4.gem
+- vendor/cache/excon-0.17.0.gem
+- vendor/cache/fog-1.8.0.gem
+- vendor/cache/formatador-0.2.4.gem
+- vendor/cache/guard-1.6.2.gem
+- vendor/cache/guard-rspec-2.4.0.gem
+- vendor/cache/highline-1.6.15.gem
+- vendor/cache/httpclient-2.2.4.gem
+- vendor/cache/i18n-0.6.1.gem
+- vendor/cache/json_pure-1.6.8.gem
+- vendor/cache/listen-0.7.2.gem
+- vendor/cache/log4r-1.1.10.gem
+- vendor/cache/lumberjack-1.0.2.gem
+- vendor/cache/method_source-0.8.1.gem
+- vendor/cache/mime-types-1.21.gem
+- vendor/cache/multi_json-1.1.0.gem
+- vendor/cache/net-scp-1.0.4.gem
+- vendor/cache/net-ssh-2.2.2.gem
+- vendor/cache/net-ssh-gateway-1.1.0.gem
+- vendor/cache/netaddr-1.5.0.gem
+- vendor/cache/nokogiri-1.5.6-java.gem
+- vendor/cache/nokogiri-1.5.6.gem
+- vendor/cache/open4-1.3.0.gem
+- vendor/cache/progressbar-0.9.2.gem
+- vendor/cache/pry-0.9.11.4-java.gem
+- vendor/cache/pry-0.9.11.4.gem
+- vendor/cache/rake-10.0.3.gem
+- vendor/cache/rb-fsevent-0.9.3.gem
+- vendor/cache/redcard-1.0.0.gem
+- vendor/cache/rspec-2.12.0.gem
+- vendor/cache/rspec-core-2.12.2.gem
+- vendor/cache/rspec-expectations-2.12.1.gem
+- vendor/cache/rspec-mocks-2.12.2.gem
+- vendor/cache/ruby-atmos-pure-1.0.5.gem
+- vendor/cache/ruby-hmac-0.4.0.gem
+- vendor/cache/settingslogic-2.0.9.gem
+- vendor/cache/slop-3.4.3.gem
+- vendor/cache/spoon-0.0.1.gem
+- vendor/cache/terminal-table-1.4.5.gem
+- vendor/cache/thor-0.17.0.gem
+- vendor/cache/uuidtools-2.1.3.gem
+- vendor/cache/xml-simple-1.1.2.gem
 homepage: https://github.com/StarkAndWayne/bosh-bootstrap
 licenses: []
 post_install_message: 
@@ -313,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -279783410373190503
+      hash: 2829308675066095393
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -326,7 +386,12 @@ test_files:
 - spec/assets/bosh/public_stemcells/aws_micro.out
 - spec/assets/micro_bosh_yml/micro_bosh.aws_ec2.yml
 - spec/assets/micro_bosh_yml/micro_bosh.aws_vpc.yml
-- spec/functional/.gitkeep
+- spec/integration/.gitkeep
+- spec/integration/aws/aws_basic_spec.rb
+- spec/integration/aws/aws_edge_prebuilt_ami_spec.rb
+- spec/integration/aws/aws_edge_prebuilt_spec.rb
+- spec/integration/aws/aws_edge_spec.rb
+- spec/integration/aws/aws_helpers.rb
 - spec/spec_helper.rb
 - spec/unit/.gitkeep
 - spec/unit/aws_spec.rb

data/lib/bosh-bootstrap/stages/stage_setup_new_bosh/cleanup_permissions

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Cleanup file permissions
-
-if [[ $EUID -ne 0 ]]; then
-  echo "ERROR: This script must be run as root" 1>&2
-  exit 1
-fi
-
-chown -R vcap:vcap ~vcap/.bosh*
-if [[ -d ~vcap/.gem ]]; then
-  chown -R vcap:vcap ~vcap/.gem
-fi
-chown -R vcap:vcap /var/vcap/store/repos