Permalink
Browse files

Merge "Remove CC Staging Configuration"

  • Loading branch information...
2 parents 199eb4f + 352886c commit 61738e3560ef32c87b7d2a18d7e326eef4252bc6 Jennifer Hickey committed with Gerrit Code Review Sep 17, 2012
@@ -74,7 +74,6 @@ if vcap_components["components"].include?("cloud_controller")
puts "Setting up cloud controller environment"
ENV["CLOUD_CONTROLLER_CONFIG"]=File.join(deployment_config_path, "cloud_controller.yml")
ENV["RAILS_ENV"]="production"
- ENV["PLATFORM_CONFIG"]=File.join(deployment_config_path, "staging","platform.yml")
# Start the cloud controller component first as other components like the
# health manager depend on it. Specifically, the health manager uses the same
@@ -16,7 +16,6 @@
default[:cloud_controller][:staging][:lift] = "lift.yml"
default[:cloud_controller][:staging][:node] = "node.yml"
default[:cloud_controller][:staging][:otp_rebar] = "otp_rebar.yml"
-default[:cloud_controller][:staging][:platform] = "platform.yml"
default[:cloud_controller][:staging][:rack] = "rack.yml"
default[:cloud_controller][:staging][:rails3] = "rails3.yml"
default[:cloud_controller][:staging][:sinatra] = "sinatra.yml"
@@ -52,7 +52,6 @@ directories:
resources: /var/vcap/shared/resources
# default values, relative to Rails.root. Leading slash for full path.
staging_manifests: <%= File.join(node[:deployment][:config_path], "staging") %>
- staging_cache: /var/vcap/data/cloud_controller/staging
tmpdir: /var/vcap/data/cloud_controller/tmp
# NATS message bus URI
@@ -91,15 +90,9 @@ redis:
# App staging parameters
staging:
- max_concurrent_stagers: 10
# Max duration for staging process
max_staging_runtime: 120 # secs
- # Create a secure environment for staging
- secure: false
- new_stager_percent: 100
- new_stager_email_regexp: .*@vmware.com
-
auth:
user: zxsfhgjg
password: ZNVfdase9
@@ -1,3 +0,0 @@
----
-cache: /var/vcap.local/staging
-runtime: # if nil, determined at load time by default 'ruby'

0 comments on commit 61738e3

Please sign in to comment.