bosh-bootstrap 0.10.0 → 0.10.1

data/.travis.yml

@@ -16,7 +16,7 @@ env:
     - SUITE=unit
     # - SUITE=integration:aws:basic
     # - SUITE=integration:aws:edge
-    - SUITE=integration:aws:edge_prebuilt
+    # - SUITE=integration:aws:edge_prebuilt
     # - SUITE=integration:aws:edge_prebuilt_ami
   global:
     - secure: "OS3pnXOAVRP0QPDl/Nn/0iBPZbrnn9irFYwEbMJ2fGPsV00u4IYDwoIN5Gzb\nX+cXyiPZB0jdQlbiCMaQEYjYig3fgnDhiLj/MnxkVYtILm+0uPSrX2Zf7jvR\nmxCT5jfTSZoPXQeNi9h8rEqvaqKv4z930xp/Z0QNoZLPWdwY5wk="

data/ChangeLog.md

@@ -12,6 +12,8 @@
 * AWS all regions are working (using pre-created stemcell)
 * OpenStack is now working (using pre-created stemcell)
 * `deploy --create-inception` chooses to create an inception VM
+* Using `bosh_cli_plugin_micro` (for `bosh micro`) [was `bosh_deployer`]  (v1.10.1)
+* `bosh-cloudfoundry` gem installed with prerelease gems (fix in v0.10.1)
 
 ## v0.9
 
@@ -21,15 +23,12 @@
 * AWS other regions will use a pre-created stemcell. I haven't tested this well yet.
 * OpenStack support is still broken because you need to create your own stemcells and for that you need a 12.10 inception VM and that work isn't quite done yet.
 
-## v0.8 (& v0.8.1)
+## v0.8
 
 * SSH keys used to access inception VM are now generated and stored within the `~/.bosh_bootstrap/ssh` folder. This fixes many issues that many people were having (their keys had passphrases, their fog_default keypair was old). It also allows a manifest file to be shared between people as it contains the private key contents, and the private key file will be recreated if it is missing.
 * existing inception VMs' manifest.yml will be upgraded automatically and a backup file created (just in case)
 * tightening of net-ssh & net-scp gems to ensure the bosh-bootstrap gem can be installed [thx @mmb]
-
-### v0.8.2
-
-* preinstall net-ssh/net-scp/fog on inception VM before installing `bosh_deployer` to fix in ability to install `bosh_deployer` 1.4.1 due to latest fog 1.10.0 release
+* preinstall net-ssh/net-scp/fog on inception VM before installing `bosh_deployer` to fix in ability to install `bosh_deployer` 1.4.1 due to latest fog 1.10.0 release (v0.8.2)
 
 ## v0.7
 

data/lib/bosh-bootstrap/stages/stage_prepare_inception_vm.rb

@@ -61,7 +61,8 @@ module Bosh::Bootstrap::Stages
       source 'https://s3.amazonaws.com/bosh-jenkins-gems/'
       
       gem "bosh_cli", "~> 1.5.0.pre"
-      gem "bosh_deployer", "~> 1.5.0.pre"
+      gem "bosh_cli_plugin_micro", "~> 1.5.0.pre"
+      gem "bosh-cloudfoundry"
       RUBY
     end
   end

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.10.0"
+    VERSION = "0.10.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -268,7 +268,6 @@ files:
 - 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
@@ -376,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1266362034070709822
+      hash: 1595328899217547208
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/bosh-bootstrap/stages/stage_prepare_inception_vm/install_bosh_by_gem_install

@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# Install BOSH CLI
-#
-# Options:
-# * $UPGRADE - re-install or upgrade gems if already installed
-# * $INSTALL_BOSH_FROM_SOURCE - install from bosh git repo
-# * $BOSH_RUBYGEM_SOURCE - URL for where bosh rubygems can be downloaded
-
-set -e # exit immediately if a simple command exits with a non-zero status
-
-if [[ $EUID -ne 0 ]]; then
-  echo "ERROR: This script must be run as root" 1>&2
-  exit 1
-fi
-
-# Install a gem if $UPGRADE exists or if gem not already installed
-function install_gem() {
-  gem_name=$1
-  options=$2
-  if [[ ("${UPGRADE}X" != "X") || "$(gem list $gem_name | grep $gem_name)X" == "X" ]]; then
-    gem install $gem_name $options --no-ri --no-rdoc
-  else
-    echo gem $gem_name already installed
-  fi
-}
-
-install_gem net-ssh '-v 2.2.2'
-install_gem net-scp '-v 1.0.4'
-install_gem fog '-v 1.9.0'
-
-if [[ "${INSTALL_BOSH_FROM_SOURCE}X" != "X" ]]; then
-  mkdir -p /var/vcap/store/repos
-  cd /var/vcap/store/repos
-  if [[ -d bosh ]]; then
-    cd bosh
-    git pull origin master
-  else
-    git clone https://github.com/cloudfoundry/bosh.git
-  fi
-
-  cd /var/vcap/store/repos/bosh
-  bundle --deployment
-  bundle --binstubs=/usr/local/sbin
-
-else
-  install_gem bosh_deployer
-fi
-
-if [[ ! -d /var/tmp/bosh ]]; then
-  echo "Symlinking the expected stemcell creation folder into mounted volume..."
-  mkdir -p /var/vcap/store/tmp/bosh
-  ln -s /var/vcap/store/tmp/bosh /var/tmp/bosh
-fi