Permalink
Browse files

ccng support for fog gem (aka s3)

also bump ccng:

git shortlog 385eb67..3635865

Alex Suraci (1):
      Merge "Add buildpack attribute to app"

Alex Suraci and Jennifer Hickey (2):
      fix logging of readable regexps
      Merge "fix logging of readable regexps"

Ali Moghadam (2):
      Add download service
      Merge "Add download service"

Bob Nugmanov and Dmitriy Kalinin (2):
      add .pairs
      Notify DEA for deleted routes

Dennis Schmidt & Roberto Ostinelli (1):
      make usage of #as_summary_json more consistent

Dmitriy Kalinin & Kowshik Prakasam (3):
      Make internal info mandatory for framework.
      fix test pollution when lets are used in before(:all)
      Enable OrgManager permission(s) for app model

Glenn Oppegard & Patrick Bozeman (2):
      improved stager debugging
      remove user_guid from provision request

Harshawardhan Gadgil (2):
      Send current user's guid in Gateway Provision request
      Merge "Send current user's guid in Gateway Provision request"

Jennifer Hickey and Alex Suraci (1):
      Add buildpack attribute to app

Jesse Zhang (3):
      Fix typo in legacy apps spec
      [fix] CCNG legacy service provisioning
      Merge changes I715816fd,Ie8d5e778

Tony Hansmann & Glenn Oppegard (1):
      change droplet storage to use the Fog gem

Tony Hansmann & Patrick Bozeman (2):
      change resource pool to use Fog gem
      change AppPackage to use Fog Gem

Change-Id: Ifac968315a603c76a91d6b6fc961f916107de358
  • Loading branch information...
1 parent 4ccb757 commit 98686485c3275fb2ae89417a449333bff6625ce0 Glenn Oppegard and Pieter Noordhuis committed Jan 29, 2013
@@ -136,6 +136,46 @@ properties:
default: 204800 # 200 GB
ccng.default_quota_definition:
default: free
+ description: "Local to use a local (NFS) file system. AWS to use AWS."
+ ccng.resource_pool.resource_directory_key:
+ description: "Directory (bucket) used store app resources. It does not have be pre-created."
+ default: "cc-resources"
+ ccng.resource_pool.fog_connection.provider:
+ description: "Local for shared resources on NFS. AWS to place them in S3."
+ default: "Local"
+ ccng.resource_pool.fog_connection.aws_access_key_id:
+ description: "AWS access key used to access the resources bucket"
+ ccng.resource_pool.fog_connection.aws_secret_access_key:
+ description: "AWS secret key used to access the resources bucket"
+ ccng.resource_pool.fog_connection.local_root:
+ description: "The directory used as the root for the Local fog provider"
+ default: "/var/vcap/shared"
+ ccng.packages.app_package_directory_key:
+ description: "Directory (bucket) used store app packages. It does not have be pre-created."
+ default: "cc-packages"
+ ccng.packages.fog_connection.provider:
+ description: "Local for shared resources on NFS. AWS to place them in S3."
+ default: "Local"
+ ccng.packages.fog_connection.aws_access_key_id:
+ description: "AWS access key used to access the packages bucket"
+ ccng.packages.fog_connection.aws_secret_access_key:
+ description: "AWS secret key used to access the packages bucket"
+ ccng.packages.fog_connection.local_root:
+ description: "The directory used as the root for the Local fog provider"
+ default: "/var/vcap/shared"
+ ccng.droplets.droplet_directory_key:
+ description: "Directory (bucket) used store droplets. It does not have be pre-created."
+ default: "cc-droplets"
+ ccng.droplets.fog_connection.provider:
+ description: "Local for droplets on NFS. AWS to place them in S3."
+ default: "Local"
+ ccng.droplets.fog_connection.aws_access_key_id:
+ description: "AWS access key used to access the droplets bucket"
+ ccng.droplets.fog_connection.aws_secret_access_key:
+ description: "AWS secret key used to access the droplets bucket"
+ ccng.droplets.fog_connection.local_root:
+ description: "The directory used as the root for the Local fog provider"
+ default: "/var/vcap/shared"
ccdb_ng.databases:
description:
ccdb_ng.roles:
@@ -39,12 +39,10 @@ info:
# allow_debug: false
<% if_p("directories.droplets",
- "directories.resources",
"directories.staging_manifests",
- "directories.tmpdir") do |droplets, resources, staging_manifests, tmpdir| %>
+ "directories.tmpdir") do |droplets, staging_manifests, tmpdir| %>
directories:
droplets: <%= droplets %>
- resources: <%= resources %>
staging_manifests: <%= staging_manifests %>
tmpdir: <%= tmpdir %>
<% end %>
@@ -109,3 +107,42 @@ quota_definitions:
paid_memory_limit: <%= p("ccng.quota_definitions.yeti.paid_memory_limit") %>
default_quota_definition: <%= p("ccng.default_quota_definition") %>
+
+resource_pool:
+ resource_directory_key: <%= p("ccng.resource_pool.resource_directory_key") %>
+ fog_connection:
+<% if_p("ccng.resource_pool.fog_connection.provider") do |provider| %>
+ provider: <%= provider %>
+ <% if provider.downcase == "local" %>
+ local_root: <%= p("ccng.resource_pool.fog_connection.local_root") %>
+ <% else %>
+ aws_access_key_id: <%= p("ccng.resource_pool.fog_connection.aws_access_key_id") %>
+ aws_secret_access_key: <%= p("ccng.resource_pool.fog_connection.aws_secret_access_key") %>
+ <% end %>
+<% end %>
+
+packages:
+ app_package_directory_key: <%= p("ccng.packages.app_package_directory_key") %>
+ fog_connection:
+<% if_p("ccng.packages.fog_connection.provider") do |provider| %>
+ provider: <%= provider %>
+ <% if provider.downcase == "local" %>
+ local_root: <%= p("ccng.packages.fog_connection.local_root") %>
+ <% else %>
+ aws_access_key_id: <%= p("ccng.packages.fog_connection.aws_access_key_id") %>
+ aws_secret_access_key: <%= p("ccng.packages.fog_connection.aws_secret_access_key") %>
+ <% end %>
+<% end %>
+
+droplets:
+ droplet_directory_key: <%= p("ccng.droplets.droplet_directory_key") %>
+ fog_connection:
+<% if_p("ccng.droplets.fog_connection.provider") do |provider| %>
+ provider: <%= provider %>
+ <% if provider.downcase == "local" %>
+ local_root: <%= p("ccng.droplets.fog_connection.local_root") %>
+ <% else %>
+ aws_access_key_id: <%= p("ccng.droplets.fog_connection.aws_access_key_id") %>
+ aws_secret_access_key: <%= p("ccng.droplets.fog_connection.aws_secret_access_key") %>
+ <% end %>
+<% end %>
@@ -59,6 +59,24 @@ http {
root /var/vcap/shared;
}
+<% if p("ccng.packages.fog_connection.provider").downcase == "local" %>
+ # used for x-accel-redirect uri://location/foo.txt
+ # nginx will serve the file root || location || foo.txt
+ location <%= "/#{p('ccng.packages.app_package_directory_key')}/" %> {
+ internal;
+ root /var/vcap/shared;
+ }
+<% end %>
+
+<% if p("ccng.droplets.fog_connection.provider").downcase == "local" %>
+ # used for x-accel-redirect uri://location/foo.txt
+ # nginx will serve the file root || location || foo.txt
+ location <%= "/#{p('ccng.droplets.droplet_directory_key')}/" %> {
+ internal;
+ root /var/vcap/shared;
+ }
+<% end %>
+
location ~ (/apps/.*/application|/v2/apps/.*/bits|/services/v\d+/configurations/.*/serialized/data) {
# Pass altered request body to this location
upload_pass @cc_uploads;
Submodule cloud_controller_ng updated 66 files
+9 −0 .pairs
+2 −1 Gemfile
+22 −4 Gemfile.lock
+18 −0 config/cloud_controller.yml
+9 −0 db/migrations/20130116175601_add_buildpack_to_app.rb
+17 −0 db/migrations/20130122234841_require_internal_info_for_frameworks.rb
+1 −2 lib/cloud_controller.rb
+4 −1 lib/cloud_controller/api/app.rb
+25 −1 lib/cloud_controller/api/app_bits.rb
+1 −21 lib/cloud_controller/api/app_summary.rb
+1 −0 lib/cloud_controller/api/framework.rb
+1 −1 lib/cloud_controller/api/resource_match.rb
+70 −24 lib/cloud_controller/app_package.rb
+8 −9 lib/cloud_controller/app_stager.rb
+33 −2 lib/cloud_controller/config.rb
+1 −1 lib/cloud_controller/dea/dea_client.rb
+1 −1 lib/cloud_controller/legacy_api/legacy_services.rb
+115 −8 lib/cloud_controller/legacy_api/legacy_staging.rb
+7 −3 lib/cloud_controller/models/app.rb
+3 −2 lib/cloud_controller/models/framework.rb
+13 −4 lib/cloud_controller/models/route.rb
+22 −1 lib/cloud_controller/models/service_instance.rb
+5 −0 lib/cloud_controller/permissions/org_permissions.rb
+16 −2 lib/cloud_controller/permissions/space_permissions.rb
+56 −22 lib/cloud_controller/resource_pool.rb
+0 −74 lib/cloud_controller/resource_pool/filesystem_pool.rb
+4 −0 lib/cloud_controller/security_context.rb
+5 −0 lib/sequel_plugins/vcap_validations.rb
+15 −22 lib/vcap/rest_api/message.rb
+42 −0 spec/api/app_bits_spec.rb
+6 −5 spec/api/app_spec.rb
+103 −12 spec/api/app_summary_spec.rb
+1 −1 spec/api/framework_spec.rb
+21 −8 spec/api/helpers/collections.rb
+27 −25 spec/api/helpers/creating_and_updating.rb
+2 −3 spec/api/helpers/deleting.rb
+1 −3 spec/api/helpers/enumeration.rb
+10 −14 spec/api/helpers/invalid_resource.rb
+48 −34 spec/api/helpers/permissions.rb
+6 −9 spec/api/helpers/querying.rb
+3 −4 spec/api/helpers/reading.rb
+26 −23 spec/api/legacy_apps_spec.rb
+6 −6 spec/api/legacy_info_spec.rb
+5 −6 spec/api/legacy_resource_match_spec.rb
+38 −16 spec/api/legacy_staging_spec.rb
+9 −13 spec/api/organization_summary_spec.rb
+5 −6 spec/api/resource_match_spec.rb
+0 −1 spec/api/space_spec.rb
+5 −5 spec/api/space_summary_spec.rb
+6 −8 spec/api/spec_helper.rb
+59 −40 spec/app_package_spec.rb
+33 −6 spec/app_stager_spec.rb
+170 −168 spec/dea/dea_client_spec.rb
+1 −1 spec/models/framework_spec.rb
+1 −3 spec/models/helpers/all_required_attributes.rb
+8 −4 spec/models/helpers/serialization.rb
+6 −7 spec/models/helpers/timestamps.rb
+39 −1 spec/models/route_spec.rb
+22 −0 spec/models/service_instance_spec.rb
+12 −4 spec/models/spec_helper.rb
+0 −40 spec/resource_pool/resource_pool_spec.rb
+0 −57 spec/resource_pool/spec_helper.rb
+13 −6 spec/resource_pool_spec.rb
+17 −0 spec/rspec_let_monkey_patch.rb
+37 −0 spec/sequel_plugins/vcap_validations_spec.rb
+95 −1 spec/spec_helper.rb

0 comments on commit 9868648

Please sign in to comment.