bosh-gen 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84853d3716260cd3a1740c5c633148f7c7f642f7
-  data.tar.gz: 621964bd09838822cc1de26aa4d79fa5b048380e
+  metadata.gz: 5e6e0c6cb1f7f7e80dee18ae57909755becabdca
+  data.tar.gz: a0ca46233c2e00e297698ce92bacd1ca69e1199c
 SHA512:
-  metadata.gz: 9f90eb0c40643cffcdc1c34efd6b517488a2f7390e28aeffe5c5ec6a835332cd4ce1a73582ce427659268287ce24d19e40fbc9f5dbe51efb84a9aa5a9a2165eb
-  data.tar.gz: 93b53fee3e0dc2d40be857adbee4e239bea705844ba3012a77d3903da680dbef48efefdde36eb1745af4b809c9a2ba843e00f7a12f7902348af35b66d57d6a4c
+  metadata.gz: 5a987ad0f2fad0ee08ff94d84ac5b23c228d3d6299162eb09e95939c313ae14ebbe53f346f8253569117f6ff06646cc63ce286a94349b2478fa97e8e769b04e2
+  data.tar.gz: 4d130b7944ac886292ec1bdccf337d3bce55c97ca66ac1d2e9c1d3fe0e4b8ace22597bf76610316f024cfd545a9b0e6a437f6ec13a0cc902f59635dda2acc8e7

data/ChangeLog.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+v0.21.0
+
+-	`new` assumes using [spruce](https://github.com/geofffranks/spruce) instead of spiff. Yay!
+-	`new` no longer creates a master-slave job template
+-	`new` now creates a wrapper job `just_install_packages` that is useful for initial development of packages prior to creating new job templates with `bosh-gen job`.
+
 v0.20.0
 -------
 
@@ -13,7 +19,7 @@ Improved generators:
 -	`new` - spiff templates include modern `templates:` array of `{name: job, release: release}`
 -	`new` - added an Apache `LICENSE.md` file which will be included in final releases
 -	`new --apt` - Vagrant image upgraded to trusty to match trusty stemcells [thx @cyrille-leclerc]
--	`new` - describes how to use release via https://bosh.io; how developers share with https://bosh.io [v0.21.1]
+-	`new` - describes how to use release via https://bosh.io; how developers share with https://bosh.io [v0.20.1]
 
 Removed generators:
 

data/README.md

@@ -3,6 +3,8 @@ BOSH Generators
 
 Generators for creating and sharing BOSH releases.
 
+New in 0.20: Create packages from embedded Docker images
+
 New in 0.17: Creates blobstore/bucket when creating new release. AWS bucket is publicly readable.
 
 If you would like to share your BOSH release with the world, you can use the [BOSH Community AWS S3 account](#share-bosh-releases).
@@ -22,12 +24,13 @@ Usage
 -----
 
 ```
-$ bosh-gen new my-project
+$ bosh-gen new $(whoami)-project
       create  
 Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 1. AWS (community)
 2. Alternate credentials
 Choose an auto-detected infrastructure: 2
+Choose AWS region: 1
 
       create  README.md
       create  Rakefile
@@ -57,33 +60,26 @@ $ cd ./my-project-boshrelease
 ```
 
 ```
-$ wget -P /tmp http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
-$ bosh-gen package ruby -f /tmp/ruby-1.9.3-p194.tar.gz
+$ wget -P /tmp http://ftp.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz
+$ bosh-gen package ruby -f /tmp/ruby-2.2.2.tar.gz
 
 $ bosh-gen job some-ruby-job -d ruby
 
-$ git add .
-$ git commit -m "added a job + 3 packages"
-
-$ bosh create release
+$ bosh create release --force
 ```
 
-It is not ideal to include large source files, such as the 10Mb ruby tarball, in your git repository. Rather, use the blobstore for those:
+To test out each iteration of your release, you can create a manifest, upload your release, and deploy it:
 
 ```
-$ rm -rf src/ruby/ruby-1.9.3-p194.tar.gz
-$ bosh add blob /tmp/ruby-1.9.3-p194.tar.gz ruby
-$ bosh upload blobs
-
-$ bosh create release
+./templates/make_manifest warden
+bosh upload release
+bosh -n deploy
 ```
 
-Your job may need additional configuration files or executables installed.
+The large ruby tarball is automatically placed in the `blobs/` folder. Before you share your boshrelease with other developers you will want to sync it to your blobstore (the S3 bucket created via `bosh-gen new`\):
 
 ```
-$ bosh-gen template some-ruby-job config/some-config.ini
-    create  jobs/some-ruby-job/templates/some-config.ini.erb
-     force  jobs/some-ruby-job/spec
+$ bosh upload blobs
 ```
 
 Quickly creating packages
@@ -95,19 +91,25 @@ There is a slow way to create a package, and there are three faster ways. Slow v
 
 ```
 $ bosh-gen package apache2
+create  packages/apache2/packaging
+create  packages/apache2/spec
 ```
 
 The slowest way to create a package is to run the command above, then get the source, read the "install from source" instructions, and create a package.
 
 ### Slightly faster way
 
+As above, when we created the `ruby` package we included a pre-downloaded asset:
+
 ```
-$ bosh-gen package redis -f ~/Downloads/redis-2.8.3.tar.gz
+$ bosh-gen package ruby -f /tmp/ruby-2.2.2.tar.gz
 ```
 
 If you download the source files first, and reference them with the `bosh-gen package` generator, then it will attempt to guess how to install the package. The generated `packaging` script will include some starting commands that might work.
 
-The command above will also copy the target file into the `blobs/redis/` folder. One less thing for you to do.
+The command above will also copy the target file into the `blobs/ruby/` folder. One less thing for you to do.
+
+You still need to look up "how to install from source" instructions and put them in `packages/ruby/packaging` script.
 
 ### Fastest way - reuse existing packages
 
@@ -123,6 +125,61 @@ This is a great command to use. There are a growing number of BOSH releases on G
 
 Remember, first run `bosh sync blobs` in the target BOSH release project. Otherwise it will not be able to copy over the blobs.
 
+### Fast way - embedded Docker images
+
+This use case assumes you have `docker` CLI installed and access to a Docker daemon.
+
+It will also make your BOSH release dependent upon the [cf-platform-eng/docker-boshrelease](https://bosh.io/d/github.com/cf-platform-eng/docker-boshrelease) release which installs the Docker daemon on VMs; and offers a simple way to run Docker containers if required.
+
+```
+$ bosh-gen package tmate --docker-image nicopace/tmate-docker
+       exist  jobs
+      create  jobs/nicopace_tmate_docker_image/monit
+      create  jobs/nicopace_tmate_docker_image/spec
+      create  jobs/nicopace_tmate_docker_image/templates/bin/install_ctl
+      create  jobs/nicopace_tmate_docker_image/templates/bin/monit_debugger
+      create  jobs/nicopace_tmate_docker_image/templates/helpers/ctl_setup.sh
+      create  jobs/nicopace_tmate_docker_image/templates/helpers/ctl_utils.sh
+       exist  packages
+      create  packages/tmate/packaging
+      create  packages/tmate/spec
+docker pull nicopace/tmate-docker
+Pulling repository nicopace/tmate-docker
+7b9df453c66b: Download complete
+...
+6df853718c80: Download complete
+Status: Image is up to date for nicopace/tmate-docker:latest
+docker save nicopace/tmate-docker > blobs/docker-images/nicopace_tmate_docker.tgz
+
+$ bosh create release --force
+...
+Release name: tmate-server
+Release version: 0+dev.1
+```
+
+The `package --docker-image` flag will display the next steps help as well:
+
+```
+Next steps:
+  1. To use this BOSH release, first upload it and the docker release to your BOSH:
+    bosh upload release https://bosh.io/releases/cloudfoundry-community/consul-docker
+    bosh upload release https://bosh.io/d/github.com/cf-platform-eng/docker-boshrelease
+
+  2. To use the docker image, your deployment job needs to start with the following:
+
+    jobs:
+    - name: some_job
+    templates:
+      # run docker daemon
+      - {name: docker, release: docker}
+      # warm docker image cache from bosh package
+      - {name: nicopace_tmate_docker_image, release: tmate-server}
+
+  3. To simply run a single container, try the 'containers' job from 'docker' release
+
+    https://github.com/cloudfoundry-community/consul-docker-boshrelease/blob/master/templates/jobs.yml#L18-L40
+```
+
 ### Fast way - reuse Aptitude/Debian packages
 
 ```

data/lib/bosh/gen/generators/new_release_generator.rb

@@ -120,6 +120,7 @@ module Bosh::Gen
             }
           }
         end
+        config_final["final_name"] = project_name
 
         create_file "config/final.yml", YAML.dump(config_final)
       end
@@ -129,7 +130,7 @@ module Bosh::Gen
         config/dev.yml
         config/private.yml
         config/settings.yml
-        releases/*.tgz
+        releases/**/*.tgz
         dev_releases
         blobs/*
         .blobs

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/just_install_packages/spec.tt

@@ -0,0 +1,6 @@
+---
+name: just_install_packages
+packages: []
+templates:
+  ignoreme: ignoreme
+properties: {}

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

@@ -1,24 +1,20 @@
 meta:
-  environment: (( merge ))
-  stemcell: (( merge ))
+  environment: (( params "please set environment" ))
+  stemcell: (( params "please set stemcell" ))
 
-name: (( meta.environment ))
+name: (( grab meta.environment ))
 
-director_uuid: (( merge ))
+director_uuid: (( params "please set director_uuid" ))
 
-releases: (( merge ))
+releases: (( params "please set release" ))
 
-networks: (( merge ))
-
-jobs: (( merge ))
-
-properties: (( merge ))
+jobs: (( params "please set jobs" ))
 
 compilation:
   workers: 6
   network: <%= project_name_underscored %>1
   reuse_compilation_vms: true
-  cloud_properties: (( merge ))
+  cloud_properties: (( params "please set compilation cloud properties" ))
 
 update:
   canaries: 1
@@ -30,6 +26,5 @@ update:
 resource_pools:
   - name: small_z1
     network: <%= project_name_underscored %>1
-    size: (( auto ))
-    stemcell: (( meta.stemcell ))
-    cloud_properties: (( merge ))
+    stemcell: (( grab meta.stemcell ))
+    cloud_properties: (( params "please set resource_pool cloud properties" ))

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

@@ -1,7 +1,7 @@
 meta:
-  environment: (( merge ))
-  dns_root: (( merge ))
-  security_groups: (( merge ))
+  environment: (( params "please set meta environment" ))
+  dns_root: (( params "please set meta dns_root" ))
+  security_groups: (( params "please set meta security_groups" ))
   persistent_disk: 4096
 
   stemcell:
@@ -9,19 +9,10 @@ meta:
     version: latest
 
 jobs:
-  - name: <%= project_name_underscored %>_leader_z1
-    instances: 1
+  - name: just_install_packages
     networks:
       - name: <%= project_name_underscored %>1
-    persistent_disk: (( meta.persistent_disk ))
-  - name: <%= project_name_underscored %>_z1
-    instances: 2
-    networks:
-      - name: <%= project_name_underscored %>1
-    persistent_disk: (( meta.persistent_disk ))
-    properties:
-      <%= project_name_underscored %>:
-        leader_address: (( "0.<%= project_name_hyphenated %>-leader-z1.<%= project_name_hyphenated %>1." meta.environment "." meta.dns_root ))
+    persistent_disk: (( grab meta.persistent_disk ))
 
 compilation:
   cloud_properties:
@@ -39,4 +30,4 @@ networks:
   - name: <%= project_name_underscored %>1
     type: dynamic
     cloud_properties:
-      security_groups: (( meta.security_groups ))
+      security_groups: (( grab meta.security_groups ))

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

@@ -12,19 +12,9 @@ update:
   update_watch_time: 1000-30000
 
 jobs:
-  - name: <%= project_name_underscored %>_leader_z1
-    instances: 1
+  - name: just_install_packages
     networks:
       - name: <%= project_name_underscored %>1
-        static_ips: (( static_ips(0) ))
-  - name: <%= project_name_underscored %>_z1
-    instances: 2
-    networks:
-      - name: <%= project_name_underscored %>1
-        static_ips: ~
-    properties:
-      <%= project_name_underscored %>:
-        leader_address: (( jobs.<%= project_name_underscored %>_leader_z1.networks.<%= project_name_underscored %>1.static_ips.[0] ))
 
 compilation:
   cloud_properties:
@@ -37,70 +27,10 @@ resource_pools:
 
 networks:
 - name: <%= project_name_underscored %>1
-  # Assumes up to 5 VMs, including 1 static and 4 dynamic.
-  # Plus 5 (double the size) unused IPs, due to BOSH bug/quirk.
+  type: manual
   subnets:
-  - cloud_properties:
-      name: random
-    range: 10.244.2.0/30
-    reserved:
-    - 10.244.2.1
+  - range: 10.244.2.0/24
+    name: <%= project_name_underscored %>1
+    gateway: 10.244.2.1
     static:
-    - 10.244.2.2
-
-  - cloud_properties:
-      name: random
-    range: 10.244.2.4/30
-    reserved:
-    - 10.244.2.5
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.8/30
-    reserved:
-    - 10.244.2.9
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.12/30
-    reserved:
-    - 10.244.2.13
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.16/30
-    reserved:
-    - 10.244.2.17
-    static: []
-
-  # Bonus double-sized network required due to BOSH oddity
-  - cloud_properties:
-      name: random
-    range: 10.244.2.20/30
-    reserved:
-    - 10.244.2.21
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.24/30
-    reserved:
-    - 10.244.2.25
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.28/30
-    reserved:
-    - 10.244.2.29
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.32/30
-    reserved:
-    - 10.244.2.33
-    static: []
-  - cloud_properties:
-      name: random
-    range: 10.244.2.36/30
-    reserved:
-    - 10.244.2.37
-    static: []
+      - 10.244.2.2-10.244.2.60

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

@@ -9,29 +9,15 @@ update:
   serial: false
 
 jobs:
-  - name: <%= project_name_underscored %>_leader_z1
+  - name: just_install_packages
     templates:
-    - name: <%= project_name_hyphenated %>
+    - name: just_install_packages
       release: <%= project_name_hyphenated %>
-    instances: 0
-    resource_pool: small_z1
-    networks: (( merge ))
+    instances: 1
     persistent_disk: 0
-    properties: {}
-  - name: <%= project_name_underscored %>_z1
-    templates:
-    - name: <%= project_name_hyphenated %>
-      release: <%= project_name_hyphenated %>
-    instances: 0
     resource_pool: small_z1
-    networks: (( merge ))
-    persistent_disk: 0
-    update:
-      canaries: 10
-    properties:
-      <%= project_name_underscored %>:
-        leader_address: (( merge ))
+    networks: (( params "please set just_install_package networks" ))
 
-networks: (( merge ))
+networks: (( params "please set networks" ))
 
 properties: {}

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

@@ -59,7 +59,11 @@ perl -pi -e "s/PLACEHOLDER-DIRECTOR-UUID/$DIRECTOR_UUID/g" $tmpdir/stub-with-uui
 perl -pi -e "s/NAME/$NAME/g" $tmpdir/stub-with-uuid.yml
 perl -pi -e "s/STEMCELL/$STEMCELL/g" $tmpdir/stub-with-uuid.yml
 
-spiff merge \
+if ! [ -x "$(command -v spruce)" ]; then
+  echo 'spruce is not installed. Please download at https://github.com/geofffranks/spruce/releases' >&2
+fi
+
+spruce merge --prune meta \
   $templates/deployment.yml \
   $templates/jobs.yml \
   $templates/infrastructure-${infrastructure}.yml \

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.20.1"
+    VERSION = "0.21.0"
   end
 end

data/spec/generators/new_release_generator_spec.rb

@@ -39,6 +39,7 @@ describe Bosh::Gen::Generators::NewReleaseGenerator do
 
       config = YAML.load_file("config/final.yml")
       expect(config).to_not be_nil
+      expect(config["final_name"]).to eq("redis")
       expect(config["blobstore"]).to_not be_nil
       expect(config["blobstore"]["options"]).to_not be_nil
       expect(config["blobstore"]["provider"]).to eq("s3")
@@ -71,6 +72,7 @@ describe Bosh::Gen::Generators::NewReleaseGenerator do
 
       config = YAML.load_file("config/final.yml")
       expect(config).to_not be_nil
+      expect(config["final_name"]).to eq("redis")
       expect(config["blobstore"]).to_not be_nil
       expect(config["blobstore"]["options"]).to_not be_nil
       expect(config["blobstore"]["provider"]).to eq("swift")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -234,16 +234,10 @@ files:
 - lib/bosh/gen/generators/new_release_generator/templates/README.md.tt
 - lib/bosh/gen/generators/new_release_generator/templates/Rakefile
 - lib/bosh/gen/generators/new_release_generator/templates/blobs/.gitkeep
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/monit.tt
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/spec.tt
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/bin/%job_name%_ctl.tt
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/bin/monit_debugger
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/config/%job_name%.conf.erb.tt
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/config/.gitkeep
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/data/properties.sh.erb
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/helpers/ctl_setup.sh
-- lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/helpers/ctl_utils.sh
 - lib/bosh/gen/generators/new_release_generator/templates/jobs/.gitkeep
+- lib/bosh/gen/generators/new_release_generator/templates/jobs/just_install_packages/monit.tt
+- lib/bosh/gen/generators/new_release_generator/templates/jobs/just_install_packages/spec.tt
+- lib/bosh/gen/generators/new_release_generator/templates/jobs/just_install_packages/templates/ignoreme
 - lib/bosh/gen/generators/new_release_generator/templates/packages/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/src/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/templates/deployment.yml.tt
@@ -370,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ''

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/monit.tt

@@ -1,5 +0,0 @@
-check process <%= job_name %>
-  with pidfile /var/vcap/sys/run/<%= job_name %>/<%= job_name %>.pid
-  start program "/var/vcap/jobs/<%= job_name %>/bin/monit_debugger <%= job_name %>_ctl '/var/vcap/jobs/<%= job_name %>/bin/<%= job_name %>_ctl start'"
-  stop program "/var/vcap/jobs/<%= job_name %>/bin/monit_debugger <%= job_name %>_ctl '/var/vcap/jobs/<%= job_name %>/bin/<%= job_name %>_ctl stop'"
-  group vcap

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/spec.tt

@@ -1,13 +0,0 @@
----
-name: <%= project_name_hyphenated %>
-packages: []
-templates:
-  bin/monit_debugger: bin/monit_debugger
-  bin/<%= job_name %>_ctl: bin/<%= job_name %>_ctl
-  config/<%= job_name %>.conf.erb: config/<%= job_name %>.conf
-  data/properties.sh.erb: data/properties.sh
-  helpers/ctl_setup.sh: helpers/ctl_setup.sh
-  helpers/ctl_utils.sh: helpers/ctl_utils.sh
-properties:
-  <%= project_name_underscored %>.leader_address:
-    description: Hostname/IP to the leader/master of the cluster

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/bin/%job_name%_ctl.tt

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-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
-source /var/vcap/jobs/<%= job_name %>/helpers/ctl_setup.sh '<%= job_name %>'
-
-export PORT=${PORT:-5000}
-export LANG=en_US.UTF-8
-
-case $1 in
-
-  start)
-    pid_guard $PIDFILE $JOB_NAME
-
-    # store pid in $PIDFILE
-    echo $$ > $PIDFILE
-
-    exec chpst -u vcap:vcap <%= job_name %> \
-         >>$LOG_DIR/$JOB_NAME.stdout.log \
-         2>>$LOG_DIR/$JOB_NAME.stderr.log
-
-    ;;
-
-  stop)
-    kill_and_wait $PIDFILE
-
-    ;;
-  *)
-    echo "Usage: <%= job_name %>_ctl {start|stop}"
-
-    ;;
-
-esac
-exit 0

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/bin/monit_debugger

@@ -1,13 +0,0 @@
-#!/bin/sh
-# USAGE monit_debugger <label> command to run
-mkdir -p /var/vcap/sys/log/monit
-{
-  echo "MONIT-DEBUG date"
-  date
-  echo "MONIT-DEBUG env"
-  env
-  echo "MONIT-DEBUG $@"
-  $2 $3 $4 $5 $6 $7
-  R=$?
-  echo "MONIT-DEBUG exit code $R"
-} >/var/vcap/sys/log/monit/monit_debugger.$1.log 2>&1

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/config/%job_name%.conf.erb.tt

@@ -1,5 +0,0 @@
-# Example of how to do one thing when job is master/leader, and another thing if its follower/slave
-# See templates/infrastructure-warden.yml & templates/jobs.yml for where this value originates
-<%% if_p("<%= project_name_underscored %>.leader_address") do |leader_address| %>
-leader: <%%= leader_address %>
-<%% end %>

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/data/properties.sh.erb

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# job template binding variables
-
-# job name & index of this VM within cluster
-# e.g. JOB_NAME=redis, JOB_INDEX=0
-export NAME='<%= name %>'
-export JOB_INDEX=<%= index %>
-# full job name, like redis/0 or webapp/3
-export JOB_FULL="$NAME/$JOB_INDEX"
-
-export DEPLOYMENT_NAME=<%= spec.deployment %>
-export DNS_ROOT=<%= spec.dns_domain_name %>
-
-# $BIND_ADDR is the IP of the first network
-export BIND_ADDR=<%= spec.networks.send(spec.networks.methods(false).first).ip %>

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/helpers/ctl_setup.sh

@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-# Setup env vars and folders for the ctl script
-# This helps keep the ctl script as readable
-# as possible
-
-# Usage options:
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh JOB_NAME OUTPUT_LABEL
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar foobar
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar nginx
-
-set -e # exit immediately if a simple command exits with a non-zero status
-set -u # report the usage of uninitialized variables
-
-JOB_NAME=$1
-output_label=${1:-JOB_NAME}
-
-export JOB_DIR=/var/vcap/jobs/$JOB_NAME
-chmod 755 $JOB_DIR # to access file via symlink
-
-# Load some bosh deployment properties into env vars
-# Try to put all ERb into data/properties.sh.erb
-# incl $NAME, $JOB_INDEX, $WEBAPP_DIR
-source $JOB_DIR/data/properties.sh
-
-source $JOB_DIR/helpers/ctl_utils.sh
-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
-
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-''} # default to empty
-for package_bin_dir in $(ls -d /var/vcap/packages/*/lib)
-do
-  export LD_LIBRARY_PATH=${package_bin_dir}:$LD_LIBRARY_PATH
-done
-
-# Setup log, run and tmp folders
-
-export RUN_DIR=/var/vcap/sys/run/$JOB_NAME
-export LOG_DIR=/var/vcap/sys/log/$JOB_NAME
-export TMP_DIR=/var/vcap/sys/tmp/$JOB_NAME
-export STORE_DIR=/var/vcap/store/$JOB_NAME
-for dir in $RUN_DIR $LOG_DIR $TMP_DIR $STORE_DIR
-do
-  mkdir -p ${dir}
-  chown vcap:vcap ${dir}
-  chmod 775 ${dir}
-done
-export TMPDIR=$TMP_DIR
-
-export C_INCLUDE_PATH=/var/vcap/packages/mysqlclient/include/mysql:/var/vcap/packages/sqlite/include:/var/vcap/packages/libpq/include
-export LIBRARY_PATH=/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib
-
-# consistent place for vendoring python libraries within package
-if [[ -d ${WEBAPP_DIR:-/xxxx} ]]
-then
-  export PYTHONPATH=$WEBAPP_DIR/vendor/lib/python
-fi
-
-if [[ -d /var/vcap/packages/java7 ]]
-then
-  export JAVA_HOME="/var/vcap/packages/java7"
-fi
-
-# setup CLASSPATH for all jars/ folders within packages
-export CLASSPATH=${CLASSPATH:-''} # default to empty
-for java_jar in $(ls -d /var/vcap/packages/*/*/*.jar)
-do
-  export CLASSPATH=${java_jar}:$CLASSPATH
-done
-
-PIDFILE=$RUN_DIR/$JOB_NAME.pid
-
-echo '$PATH' $PATH

data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/helpers/ctl_utils.sh

@@ -1,156 +0,0 @@
-# Helper functions used by ctl scripts
-
-# links a job file (probably a config file) into a package
-# Example usage:
-# link_job_file_to_package config/redis.yml [config/redis.yml]
-# link_job_file_to_package config/wp-config.php wp-config.php
-link_job_file_to_package() {
-  source_job_file=$1
-  target_package_file=${2:-$source_job_file}
-  full_package_file=$WEBAPP_DIR/${target_package_file}
-
-  link_job_file ${source_job_file} ${full_package_file}
-}
-
-# links a job file (probably a config file) somewhere
-# Example usage:
-# link_job_file config/bashrc /home/vcap/.bashrc
-link_job_file() {
-  source_job_file=$1
-  target_file=$2
-  full_job_file=$JOB_DIR/${source_job_file}
-
-  echo link_job_file ${full_job_file} ${target_file}
-  if [[ ! -f ${full_job_file} ]]
-  then
-    echo "file to link ${full_job_file} does not exist"
-  else
-    # Create/recreate the symlink to current job file
-    # If another process is using the file, it won't be
-    # deleted, so don't attempt to create the symlink
-    mkdir -p $(dirname ${target_file})
-    ln -nfs ${full_job_file} ${target_file}
-  fi
-}
-
-# If loaded within monit ctl scripts then pipe output
-# If loaded from 'source ../utils.sh' then normal STDOUT
-redirect_output() {
-  SCRIPT=$1
-  mkdir -p /var/vcap/sys/log/monit
-  exec 1>> /var/vcap/sys/log/monit/$SCRIPT.log
-  exec 2>> /var/vcap/sys/log/monit/$SCRIPT.err.log
-}
-
-pid_guard() {
-  pidfile=$1
-  name=$2
-
-  if [ -f "$pidfile" ]; then
-    pid=$(head -1 "$pidfile")
-
-    if [ -n "$pid" ] && [ -e /proc/$pid ]; then
-      echo "$name is already running, please stop it first"
-      exit 1
-    fi
-
-    echo "Removing stale pidfile..."
-    rm $pidfile
-  fi
-}
-
-wait_pid() {
-  pid=$1
-  try_kill=$2
-  timeout=${3:-0}
-  force=${4:-0}
-  countdown=$(( $timeout * 10 ))
-
-  echo wait_pid $pid $try_kill $timeout $force $countdown
-  if [ -e /proc/$pid ]; then
-    if [ "$try_kill" = "1" ]; then
-      echo "Killing $pidfile: $pid "
-      kill $pid
-    fi
-    while [ -e /proc/$pid ]; do
-      sleep 0.1
-      [ "$countdown" != '0' -a $(( $countdown % 10 )) = '0' ] && echo -n .
-      if [ $timeout -gt 0 ]; then
-        if [ $countdown -eq 0 ]; then
-          if [ "$force" = "1" ]; then
-            echo -ne "\nKill timed out, using kill -9 on $pid... "
-            kill -9 $pid
-            sleep 0.5
-          fi
-          break
-        else
-          countdown=$(( $countdown - 1 ))
-        fi
-      fi
-    done
-    if [ -e /proc/$pid ]; then
-      echo "Timed Out"
-    else
-      echo "Stopped"
-    fi
-  else
-    echo "Process $pid is not running"
-    echo "Attempting to kill pid anyway..."
-    kill $pid
-  fi
-}
-
-wait_pidfile() {
-  pidfile=$1
-  try_kill=$2
-  timeout=${3:-0}
-  force=${4:-0}
-  countdown=$(( $timeout * 10 ))
-
-  if [ -f "$pidfile" ]; then
-    pid=$(head -1 "$pidfile")
-    if [ -z "$pid" ]; then
-      echo "Unable to get pid from $pidfile"
-      exit 1
-    fi
-
-    wait_pid $pid $try_kill $timeout $force
-
-    rm -f $pidfile
-  else
-    echo "Pidfile $pidfile doesn't exist"
-  fi
-}
-
-kill_and_wait() {
-  pidfile=$1
-  # Monit default timeout for start/stop is 30s
-  # Append 'with timeout {n} seconds' to monit start/stop program configs
-  timeout=${2:-25}
-  force=${3:-1}
-  if [[ -f ${pidfile} ]]
-  then
-    wait_pidfile $pidfile 1 $timeout $force
-  else
-    # TODO assume $1 is something to grep from 'ps ax'
-    pid="$(ps auwwx | grep "$1" | awk '{print $2}')"
-    wait_pid $pid 1 $timeout $force
-  fi
-}
-
-check_nfs_mount() {
-  opts=$1
-  exports=$2
-  mount_point=$3
-
-  if grep -qs $mount_point /proc/mounts; then
-    echo "Found NFS mount $mount_point"
-  else
-    echo "Mounting NFS..."
-    mount $opts $exports $mount_point
-    if [ $? != 0 ]; then
-      echo "Cannot mount NFS from $exports to $mount_point, exiting..."
-      exit 1
-    fi
-  fi
-}