bosh-gen 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f17041e4f4a608b4955a09e655c62d200689525
-  data.tar.gz: 47bb082f621ca64763a7a19cacc10323415fcb3c
+  metadata.gz: e8b00234c82d49b763a3ed19a84afceafc7493c8
+  data.tar.gz: 3c69fec977cc0128d6a91353e9933a647a715c42
 SHA512:
-  metadata.gz: 70495c5c389f7692dfef781d6c95993195cb8f2fea2cf73e80e550469a06cd56590bbe4f3ccac7485f44b0e1815f2debd8f399dadfd8bcbe845534af5cc42925
-  data.tar.gz: 03a70228d6950940a1f525b64443ba550b4f235df569be262e7dba4781ceeaf99437defb5fc1c0489f216bf8f8233a57d84f7b51d6f41621cc63c4e86f1fcd83
+  metadata.gz: 6b32ffaff5af4640f65a567baa60864021eb4faaccad2d870abbd308653874dea027a8ca9e32a2fa56f6c15974008c01052237dd6e50a1de24878a310a49c0a4
+  data.tar.gz: 77f926b0c7c91283989e7b3f237dff994fb32b8fff2976bac04269231853db3bc19c1c8b2629a3524559d74bb952779e928c71934e1e88f3e4c1d20f5251672d

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 script: bundle exec rake spec
 rvm:
-  - ruby-2.1.6
-  - ruby-2.2.2
+  - ruby-2.2.5
 notifications:
   email:
     recipients:

data/ChangeLog.md

@@ -1,6 +1,17 @@
 Change Log
 ==========
 
+v0.23.0
+
+Appreciation to James Hunt, Dennis Bell and Chris Weibel for the contributions.
+
+- Fix for multiple word deployment names and warden sanity check
+- Additional busybox system binary exclusion protection for containers
+- Ignore busybox for \*bin/lib inclusion, for better diego release compatibility
+- Don't repeat `EXITSTATUS` upon errand run, instead receive complete and useful
+  `BOSH CLI` output.
+
+
 v0.22.0
 
 Thanks to James Hunt, Quintessence Anx, and Long Nguyen for this version!

data/lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/bin/run.tt

@@ -3,10 +3,10 @@
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
-# Setup env vars and folders for the webapp_ctl script
+# Setup env vars and folders for the errand script
 source /var/vcap/jobs/<%= job_name %>/helpers/ctl_setup.sh '<%= job_name %>'
 
-EXITSTATUS=0
+############################################################################
+
+# put your errand steps here...
 
-echo "Errand <%= job_name %> is complete; exit status $EXITSTATUS"
-exit $EXITSTATUS

data/lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_setup.sh

@@ -21,16 +21,27 @@ chmod 755 $JOB_DIR # to access file via symlink
 
 source $JOB_DIR/helpers/ctl_utils.sh
 
-# Add all packages' /bin & /sbin into $PATH
-for package_bin_dir in $(ls -d /var/vcap/packages/*/*bin)
-do
-  export PATH=${package_bin_dir}:$PATH
-done
-
+# Setup the PATH and LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-''} # default to empty
-for package_bin_dir in $(ls -d /var/vcap/packages/*/lib)
+for package_dir in $(ls -d /var/vcap/packages/*)
 do
-  export LD_LIBRARY_PATH=${package_bin_dir}:$LD_LIBRARY_PATH
+  has_busybox=0
+	# Add all packages' /bin & /sbin into $PATH
+  for package_bin_dir in $(ls -d ${package_dir}/*bin)
+  do
+    # Do not add any packages that use busybox, as impacts builtin commands and
+    # is often used for different architecture (via containers)
+    if [ -f ${package_bin_dir}/busybox ]
+    then
+      has_busybox=1
+    else
+      export PATH=${package_bin_dir}:$PATH
+    fi
+  done
+  if [ "$has_busybox" == "0" ] && [ -d ${package_dir}/lib ]
+  then
+    export LD_LIBRARY_PATH=${package_dir}/lib:$LD_LIBRARY_PATH
+  fi
 done
 
 # Setup log, run and tmp folders

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/templates/helpers/ctl_setup.sh

@@ -29,16 +29,27 @@ redirect_output ${output_label}
 
 export HOME=${HOME:-/home/vcap}
 
-# Add all packages' /bin & /sbin into $PATH
-for package_bin_dir in $(ls -d /var/vcap/packages/*/*bin)
-do
-  export PATH=${package_bin_dir}:$PATH
-done
-
+# Setup the PATH and LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-''} # default to empty
-for package_bin_dir in $(ls -d /var/vcap/packages/*/lib)
+for package_dir in $(ls -d /var/vcap/packages/*)
 do
-  export LD_LIBRARY_PATH=${package_bin_dir}:$LD_LIBRARY_PATH
+  has_busybox=0
+  # Add all packages' /bin & /sbin into $PATH
+  for package_bin_dir in $(ls -d ${package_dir}/*bin)
+  do
+    # Do not add any packages that use busybox, as impacts builtin commands and
+    # is often used for different architecture (via containers)
+    if [ -f ${package_bin_dir}/busybox ]
+    then
+      has_busybox=1
+    else
+      export PATH=${package_bin_dir}:$PATH
+    fi
+  done
+  if [ "$has_busybox" == "0" ] && [ -d ${package_dir}/lib ]
+  then
+    export LD_LIBRARY_PATH=${package_dir}/lib:$LD_LIBRARY_PATH
+  fi
 done
 
 # Setup log, run and tmp folders

data/lib/bosh/gen/generators/new_release_generator/templates/README.md.tt

@@ -8,10 +8,10 @@ To use this bosh release, first upload it to your bosh:
 bosh target BOSH_HOST
 git clone https://github.com/cloudfoundry-community/<%= repository_name %>.git
 cd <%= repository_name %>
-bosh upload release releases/<%= project_name %>-1.yml
+bosh upload release releases/<%= project_name %>/<%= project_name %>-1.yml
 ```
 
-For [bosh-lite](https://github.com/cloudfoundry/bosh-lite), you can quickly create a deployment manifest & deploy a cluster:
+For [bosh-lite](https://github.com/cloudfoundry/bosh-lite), you can quickly create a deployment manifest & deploy a cluster. Note that this requires that you have installed [spruce](https://github.com/geofffranks/spruce).
 
 ```
 templates/make_manifest warden

data/lib/bosh/gen/generators/new_release_generator/templates/templates/deployment.yml.tt

@@ -1,20 +1,21 @@
+---
 meta:
-  environment: (( param "please set environment" ))
-  stemcell: (( param "please set stemcell" ))
+  environment: (( param "Please specify your environment" ))
+  stemcell: (( param "Please configure a BOSH stemcell to use for your deployment" ))
 
 name: (( grab meta.environment ))
 
-director_uuid: (( param "please set director_uuid" ))
+director_uuid: (( param "Please set the UUID of your BOSH Directory" ))
 
-releases: (( param "please set release" ))
+releases: (( param "Please list the BOSH releases to use for this deployment" ))
 
-jobs: (( param "please set jobs" ))
+jobs: (( param "Please configure the constituent Jobs for this Deployment" ))
 
 compilation:
   workers: 6
   network: <%= project_name_underscored %>1
   reuse_compilation_vms: true
-  cloud_properties: (( param "please set compilation cloud properties" ))
+  cloud_properties: (( param "Please configure the Cloud Properties for compilation VMs" ))
 
 update:
   canaries: 1
@@ -27,4 +28,4 @@ resource_pools:
   - name: small_z1
     network: <%= project_name_underscored %>1
     stemcell: (( grab meta.stemcell ))
-    cloud_properties: (( param "please set resource_pool cloud properties" ))
+    cloud_properties: (( param "Please configure the Cloud Properties for your Resource Pool" ))

data/lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-aws-ec2.yml.tt

@@ -1,7 +1,7 @@
+---
 meta:
-  environment: (( param "please set meta environment" ))
-  dns_root: (( param "please set meta dns_root" ))
-  security_groups: (( param "please set meta security_groups" ))
+  dns_root: (( param "Please configure your root DNS name" ))
+  security_groups: (( param "Please configure your AWS Security Groups" ))
   persistent_disk: 4096
 
   stemcell:

data/lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-warden.yml.tt

@@ -1,3 +1,4 @@
+---
 meta:
   environment: <%= project_name_hyphenated %>-warden
 

data/lib/bosh/gen/generators/new_release_generator/templates/templates/jobs.yml.tt

@@ -1,6 +1,4 @@
-meta:
-  environment: ~
-
+---
 update:
   canaries: 1
   max_in_flight: 50
@@ -16,8 +14,8 @@ jobs:
     instances: 1
     persistent_disk: 0
     resource_pool: small_z1
-    networks: (( param "please set just_install_package networks" ))
+    networks: (( param "Please configure the networks for this job" ))
 
-networks: (( param "please set networks" ))
+networks: (( param "Please configure the global network definitions for this Deployment" ))
 
 properties: {}

data/lib/bosh/gen/generators/new_release_generator/templates/templates/make_manifest.tt

@@ -31,10 +31,10 @@ shift
 BOSH_STATUS=$(bosh status)
 DIRECTOR_UUID=$(echo "$BOSH_STATUS" | grep UUID | awk '{print $2}')
 DIRECTOR_CPI=$(echo "$BOSH_STATUS" | grep CPI | awk '{print $2}' | sed -e 's/_cpi//')
-DIRECTOR_NAME=$(echo "$BOSH_STATUS" | grep Name | awk '{print $2}')
+DIRECTOR_NAME=$(echo "$BOSH_STATUS" | grep Name | sed 's/.*Name *//')
 NAME=$template_prefix-$infrastructure
 
-if [[ $DIRECTOR_NAME = "warden" && ${infrastructure} != "warden" ]]; then
+if [[ $DIRECTOR_CPI = "warden" && ${infrastructure} != "warden" ]]; then
   fail "Not targeting bosh-lite with warden CPI. Please make sure you have run 'bosh target' and are targeting a BOSH lite before running this script."
   exit 1
 fi
@@ -52,7 +52,7 @@ STEMCELL=${STEMCELL:-$(latest_uploaded_stemcell)}
 if [[ -z ${STEMCELL} ]]; then
   echo
   echo "Uploading latest $DIRECTOR_CPI/$STEMCELL_OS stemcell..."
-  STEMCELL_URL=$(bosh public stemcells --full | grep $DIRECTOR_CPI | grep $STEMCELL_OS | sort -nr | head -n1 | awk '{ print $4 }')
+  echo " (from ${STEMCELL_URL})"
   bosh upload stemcell $STEMCELL_URL
 fi
 STEMCELL=${STEMCELL:-$(latest_uploaded_stemcell)}

data/lib/bosh/gen/generators/package_docker_image_generator/templates/jobs/%job_name%/templates/helpers/ctl_setup.sh

@@ -24,10 +24,27 @@ redirect_output ${output_label}
 
 export HOME=${HOME:-/home/vcap}
 
-# Add all packages' /bin & /sbin into $PATH
-for package_bin_dir in $(ls -d /var/vcap/packages/*/*bin)
+# Setup the PATH and LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-''} # default to empty
+for package_dir in $(ls -d /var/vcap/packages/*)
 do
-  export PATH=${package_bin_dir}:$PATH
+  has_busybox=0
+  # Add all packages' /bin & /sbin into $PATH
+  for package_bin_dir in $(ls -d ${package_dir}/*bin)
+  do
+    # Do not add any packages that use busybox, as impacts builtin commands and
+    # is often used for different architecture (via containers)
+    if [ -f ${package_bin_dir}/busybox ]
+    then
+      has_busybox=1
+    else
+      export PATH=${package_bin_dir}:$PATH
+    fi
+  done
+  if [ "$has_busybox" == "0" ] && [ -d ${package_dir}/lib ]
+  then
+    export LD_LIBRARY_PATH=${package_dir}/lib:$LD_LIBRARY_PATH
+  fi
 done
 
 # Setup log, run and tmp folders

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.22.0"
+    VERSION = "0.23.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ''