Permalink
Commits on Sep 22, 2011
  1. Update tests submodule

    Jennifer Hickey committed Sep 22, 2011
    Change-Id: I70faa6792ca03d255348b7fbb25f7425a9ee4be5
Commits on Sep 19, 2011
  1. Clean up staging of Java based frameworks.

    AB Srinivasan committed Sep 18, 2011
    - Updates specific to a framework are in the associated plugin
    - Update patterns common to two or more frameworks are in the common Tomcat class
    - Each framework plugin now has a driver for all of the staging updates it needs
    - Enable Lift staging unit tests that were marked 'pending' on account of
    unexpected staging updates that have now been fixed.
    
    Change-Id: Ia1edcc0c9e4460b4d49ae90792d3f39d9c3ed2ad
Commits on Sep 15, 2011
  1. Spring 3.1 Environment support

    Scott Andrews committed Sep 12, 2011
    Installs the CloudApplicationContextInitializer into Spring applications.
    
    May cause backwards compatibility issues with Spring 3.1.0.M2 applications
    that assume the default profile will be active at runtime as that profile will
    no longer be active.  This is expected to be a very small minority of
    applications.
    
    Change-Id: I9b00e7d0ef5f9b39edea6146e56bea435e346f5a
Commits on Sep 14, 2011
  1. Modify staging to include mysql or postgres driver only if the app ha…

    AB Srinivasan committed Sep 7, 2011
    …s bound
    
    the associated service instance.
    Unit tests to verify this behavior.
    
    Change-Id: Id9c209835d7afe5364f55ca8c027c83bcba629e9
  2. Merge branch 'cc_stager_integration'

    mpage committed Sep 13, 2011
    Conflicts:
    	cloud_controller/Gemfile.lock
    	cloud_controller/config/cloud_controller.yml
    	cloud_controller/vendor/cache/vcap_staging-0.1.0.gem
    	cloud_controller/vendor/cache/vcap_staging-0.1.4.gem
    	stager/Gemfile.lock
    	stager/vendor/cache/vcap_staging-0.1.0.gem
    	stager/vendor/cache/vcap_staging-0.1.3.gem
    	stager/vendor/cache/vcap_staging-0.1.4.gem
    	staging/Rakefile
    	staging/lib/vcap/staging/version.rb
    	staging/vcap_staging-0.1.3.gem
    
    Change-Id: Ia5ff28b9c349210ddb3fb86eb9506beebbdd4954
Commits on Sep 13, 2011
  1. Strike 3 ..

    AB Srinivasan committed Aug 31, 2011
    Revert tomcat.zip change that introduced a digest in the archive (and the
    corresponding BVT addition) in preference to a more effective unit test
    described below. Also fix an incomplete test description.
    We now save a SHA1 digest of the tomcat.zip resulting from running the update /
    upgrade script (see vcap-java/tomcat-setup) and use a unit test (included in
    this change) to verify that the SHA1 digest of the 'tomcat.zip' used by the
    CloudController matches the saved SHA1 thus helping us prevent out-of-band
    (to the update script) updates to the tomcat.zip used by the CloudController.
    Updated to include this change in the new staging gem.
    Before this change can be actually merged, an update to the 'java' submodule
    reference is needed. That will be part of a different commit. (This is now done)
    - Included in the new staging gem.
    - Updated vcap_staging gem in vendor cache in 'stager'
    
    Change-Id: I4006c1d04dc307a7b4c17362b565de93aa4971f9
  2. Enable turning new stager on by email

    mpage committed Sep 8, 2011
    Adds support for enabling new stager use by user email as well as by
    percent.
    
    Test plan:
    - New unit test
    - Enabled for my email addr, verified that I was using the new stager.
      Ran BVTs, verified they were not using the new stager.
    - Ran BVTs on my deployment
    
    Change-Id: I4c1e55c1d7fb33e608a0626db34c4b49695fa147
  3. Add basic varz stats

    mpage committed Sep 8, 2011
    This adds counts for the number of pending tasks (tasks waiting to be processed)
    as well as the number of active tasks (tasks currently running).
    
    Test plan:
    - New unit test
    - Pushed N apps in parallel, watched varz counts
    
    Change-Id: Iadc991528a97f9d50a544ab8f05b6efff8a533bc
  4. Include staging.log if it exists, abort staging plugin if gem install…

    mpage committed Sep 7, 2011
    … fails
    
    Previously, staging would succeed even if gem installs failed. This aborts
    the staging plugin if a gem install fails.
    
    Test plan:
    - Unit tests
    - BVTs locally
    - BVTs on my deployment
    
    Change-Id: Ibbe96f4989ca004f048257e7cb3c2819e3163f70
  5. Fix typo

    mpage committed Sep 7, 2011
    Exercise for the reader:
    - How was the existing code syntactically valid?
    - What did it evaluate to?
    
    Test plan:
    - BVTs pass locally
    - BVTs pass on my deployment
    
    Change-Id: Ic665a42715a543ad0481b6c82e33a74ae3caceb0
  6. Set app state to STOPPED on staging failure

    mpage committed Sep 7, 2011
    This keeps the new stager behavior in line with the old staging behavior.
    We explicitly stop the app, instead of starting a single broken instance and
    relying on the HM flapping logic to kick in.
    
    Test plan:
    - BVTs pass locally
    - BVTs pass on deployment
    
    Change-Id: I715d5ef6df3ddb027baa6dad4437d207cf9f8777
  7. Final stager changes

    mpage committed Aug 12, 2011
    - Rewrite stager to use NATS queue groups instead of Resque.
    - Add support for staging uploads to nginx config
    - Integrate CC with stager
    - Add support to bin/vcap for controlling stager/redis instance
    
    Test plan:
    * Ran BVTs locally with and w/out the new stager, and with and w/out nginx support.
    * Ran BVTs against my deployment with and without the new stager.
    * Ran unit tests for stager and CC.
    
    Change-Id: I3c85d7de58f518d6111ca3dbf6c55fc532350d9d
Commits on Sep 12, 2011
  1. Merge "Java submodule reference update. The latest change in the way …

    AB Srinivasan committed with Gerrit Code Review Sep 12, 2011
    …we generate our Tomcat bits adds a sha1 fingerprint that is used in unit tests to ensure that the bits have not been modified out-of-band. The sha1 fingerprint is saved in the vcap-java tree. The java submodule in vcap needs to be bumped up to this latest change to allow the unit tests to do the right thing."
  2. Merge "Move php_spec from cc into staging gem"

    mpage committed with Gerrit Code Review Sep 12, 2011
  3. Merge "Remove 'new' php spec."

    mpage committed with Gerrit Code Review Sep 12, 2011
  4. Merge "race condition (cleanup_droplet and stop_cmd)"

    Woon Jung committed with Gerrit Code Review Sep 12, 2011
Commits on Sep 10, 2011
  1. Java submodule reference update.

    AB Srinivasan committed Sep 10, 2011
    The latest change in the way we generate our Tomcat bits adds a sha1
    fingerprint that is used in unit tests to ensure that the bits have not
    been modified out-of-band. The sha1 fingerprint is saved in the vcap-java
    tree. The java submodule in vcap needs to be bumped up to this latest change
    to allow the unit tests to do the right thing.
    
    Change-Id: I2263e8aa647ea28d79279e5da01494e1026984b3
  2. Move php_spec from cc into staging gem

    mpage committed Sep 10, 2011
    Test plan:
    - Unit tests pass
    
    Change-Id: Ib431bef894e28ba86c962a40927fc51a0f75baef
  3. Remove 'new' php spec.

    mpage committed Sep 10, 2011
    Test plan:
    - Unit tests pass
    
    Change-Id: I39de235f9fdbebe42fcc2e6b62bc75e40d37eb00
Commits on Sep 9, 2011
  1. Bump version for vcap/staging

    mpage committed Sep 9, 2011
    I'm a dummy. Forgot to bump the version after the rebase pulling in
    new frameworks.
    
    Test plan:
    - Unit tests for cc/staging.
    - BVTs locally
    - BVTs against deployment
    
    Change-Id: I98309d1144f892c65e06a7d416f51e4063e0bfbc
  2. Merge "Change the cookbook to match the service config file changes."

    Woon Jung committed with Gerrit Code Review Sep 9, 2011
  3. Make dea runtimes configurable

    mahpat committed Sep 7, 2011
    patch 2 - install only the selected components
    patch 3 - resolve merge conflict
    
    Change-Id: I5eb5f31ea457542290ac4f87e4e11c371be007f6
  4. Merge "Add some description to cloud foundry configy files."

    mahpat committed with Gerrit Code Review Sep 9, 2011
  5. Merge "bump tests submodule pointer for neo4j"

    Patrick Bozeman committed with Gerrit Code Review Sep 9, 2011
  6. bump tests submodule pointer for neo4j

    Patrick Bozeman committed Sep 9, 2011
    Change-Id: I6d9f60d9d315323b5b4a561435def40768b5fb27
  7. Change the cookbook to match the service config file changes.

    Woon Jung committed Sep 9, 2011
    Recent change the dev_setup cookbook this change fixex the error.
    
    e.g:
    in mysql_node
    vcap_logging-0.1.0/lib/vcap/logging.rb:82:in `setup_from_config': undefined method `[]' for nil:NilClass (NoMethodError)
    
    Change-Id: I7706fc01e1a1743bb27de60cf8f89d182f4c18bf
  8. race condition (cleanup_droplet and stop_cmd)

    Woon Jung committed Sep 8, 2011
    'stop_cmd' is a script in the app's directory and it is in charge of killing
    the process that runs the app. Currently we defer the execution (EM.system).
    
    The problem is when 'cleanup_droplet' runs before the 'stop' script.
    'cleanup_droplet' deletes the app's directory which contains the scrpit => we
    can't run the script (deleted).
    
    This change makes dea run the stop script in the main loop instead of defering
    the call. The script is pretty simple (2 kills) and it should be OK to run in
    the event loop. This could potentially be a problem if we later decide to
    beef up the stop-script.
    
    Test:
    BVT and DEA spec test (both passed)
    
    Change-Id: I28d85b7e93e171c64cfbd95016b8c0a786995a93
  9. Add some description to cloud foundry configy files.

    mahpat committed Aug 30, 2011
    These are my stabs at describing these fields, dont be too surprised if some of
    the descriptions are somewhat off from the real use.
    
    In addition to these I looked at the service node and gateway files but they dont seem
    to have many interesting fields that need specific descriptions.
    
    patch 3 - know -> known (Thansk Oleg)
    patch 4 - added the same comments to files under vcap/{cloud_controller,health_manager,router,dea}
    patch 5 - Fixed review comments.
    
    Change-Id: I65185ddc6c08eecf4516944b960367dcb9b1011d
  10. Add a high level README explaining how to use the chef scripts

    mahpat committed Aug 31, 2011
    Also updated the deployment readme to document the currently supported multihost
    setup.
    
    patch 3 - fix review comments
    patch 4 - Fix the readme with the right paths for custom deployments
    patch 5 - Fix Vadims comments
    patch 6 - Replace 'o' -> '-' :)
    
    Change-Id: Ie2f330248d0c23b900925b0ee54b6e366843713d
  11. Require 'bundler/setup' in nats_timeout.rb for the router

    mpage committed Sep 9, 2011
    This is the same issue that was encountered in the dea. nats_timeout is required
    via the command line during the tests, however, it doesn't play nice with bundler.
    It requires 'nats/client', which ends up activiting gems that are incompatible
    with the router.
    
    Test plan:
    - Unit tests pass with 'bundle exec rake spec'
    
    Change-Id: I9e868020e9de9195154d09bb721c4d1626625368
Commits on Sep 8, 2011
  1. Merge "Fix require order in 'nats_timeout.rb'"

    mpage committed with Gerrit Code Review Sep 8, 2011
  2. Squashed merge of neo4j vcap fixups:

    Patrick Bozeman committed Aug 4, 2011
    install neo4j when ALL_SERVICES is set
    create neo4j instances dir during setup
    bump services submodule pointer
    
    Change-Id: Iaf3933031823beedd344694afd05ee520e4ee5bf
  3. Neo4j vcap support

    jexp committed with Patrick Bozeman Aug 3, 2011
    Squashed commit of the following:
    
    commit 04b11c8c6dff36c00b1b7a51c6d8801fdda48c86
    Merge: a104078 5ed899a
    Author: Patrick Bozeman <pbozeman@vmware.com>
    Date:   Tue Aug 2 12:00:23 2011 -0700
    
        Merge remote-tracking branch 'jexp/master'
    
        Conflicts:
        	.gitmodules
        	cloud_controller/config/cloud_controller.yml
    
        Change-Id: I69c7cafd87e52eab2e941d4a993f03b879f0d194
    
    commit 5ed899a
    Author: Michael <github@jexp.de>
    Date:   Tue Aug 2 14:40:28 2011 +0200
    
        update to neo4j 1.4.1
    
    commit c5f4c1d
    Author: Michael <github@jexp.de>
    Date:   Wed May 25 23:17:25 2011 +0200
    
        updated gitmodules to public http url
    
    commit 10a5d3f
    Author: Michael <github@jexp.de>
    Date:   Mon May 23 11:46:31 2011 +0200
    
        updated setup to extract neo4j startup script
    
    commit 44a0a92
    Author: Michael <github@jexp.de>
    Date:   Fri May 6 02:44:39 2011 +0200
    
        updated vcap_setup to use neo4j-hosting-extension
    
    commit a662ff0
    Merge: f4f43f1 e984187
    Author: Michael <github@jexp.de>
    Date:   Tue May 3 14:09:49 2011 +0200
    
        merge vcap_setup
    
    commit f4f43f1
    Author: Michael <github@jexp.de>
    Date:   Tue May 3 14:05:34 2011 +0200
    
        neo4j services git repo for submodule
    
    commit a732e07
    Author: Michael Hunger <github@jexp.de>
    Date:   Tue May 3 14:03:14 2011 +0200
    
        xadded neo4j server provisioning
    
    commit e984187
    Author: Michael Hunger <github@jexp.de>
    Date:   Thu Apr 21 12:45:25 2011 +0200
    
        added neo4j setup
    
    commit ef3d720
    Author: Michael Hunger <github@jexp.de>
    Date:   Thu Apr 21 10:59:52 2011 +0200
    
        added neo4j services
    
    Change-Id: I6ca4cb1fb4e793c1eda9936787ce16d3837cf3ec
Commits on Sep 7, 2011
  1. Merge changes Ia7b7fd5f,I3f73e4e2

    Patrick Bozeman committed with Gerrit Code Review Sep 7, 2011
    * changes:
      Add optional profile.sh file to ease deployment
      Fixed rvm problem with root installation, and removed the "Fixing init scripts" block because it's already fixed in rvm.