Skip to content
This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Commit

Permalink
Remove CC Staging Configuration
Browse files Browse the repository at this point in the history
- Remove unused staging props from
CC config

- Remove platform config from CC

Change-Id: I61efb6f689e1e9f74787ae2e83d8034def621e47
  • Loading branch information
Jennifer Hickey committed Sep 12, 2012
1 parent 36f711c commit 352886c
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
1 change: 0 additions & 1 deletion dev_setup/bin/vcap_dev
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ if vcap_components["components"].include?("cloud_controller")
puts "Setting up cloud controller environment" puts "Setting up cloud controller environment"
ENV["CLOUD_CONTROLLER_CONFIG"]=File.join(deployment_config_path, "cloud_controller.yml") ENV["CLOUD_CONTROLLER_CONFIG"]=File.join(deployment_config_path, "cloud_controller.yml")
ENV["RAILS_ENV"]="production" 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 # Start the cloud controller component first as other components like the
# health manager depend on it. Specifically, the health manager uses the same # health manager depend on it. Specifically, the health manager uses the same
Expand Down
1 change: 0 additions & 1 deletion dev_setup/cookbooks/cloud_controller/attributes/default.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
default[:cloud_controller][:staging][:lift] = "lift.yml" default[:cloud_controller][:staging][:lift] = "lift.yml"
default[:cloud_controller][:staging][:node] = "node.yml" default[:cloud_controller][:staging][:node] = "node.yml"
default[:cloud_controller][:staging][:otp_rebar] = "otp_rebar.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][:rack] = "rack.yml"
default[:cloud_controller][:staging][:rails3] = "rails3.yml" default[:cloud_controller][:staging][:rails3] = "rails3.yml"
default[:cloud_controller][:staging][:sinatra] = "sinatra.yml" default[:cloud_controller][:staging][:sinatra] = "sinatra.yml"
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ directories:
resources: /var/vcap/shared/resources resources: /var/vcap/shared/resources
# default values, relative to Rails.root. Leading slash for full path. # default values, relative to Rails.root. Leading slash for full path.
staging_manifests: <%= File.join(node[:deployment][:config_path], "staging") %> staging_manifests: <%= File.join(node[:deployment][:config_path], "staging") %>
staging_cache: /var/vcap/data/cloud_controller/staging
tmpdir: /var/vcap/data/cloud_controller/tmp tmpdir: /var/vcap/data/cloud_controller/tmp


# NATS message bus URI # NATS message bus URI
Expand Down Expand Up @@ -91,15 +90,9 @@ redis:


# App staging parameters # App staging parameters
staging: staging:
max_concurrent_stagers: 10
# Max duration for staging process # Max duration for staging process
max_staging_runtime: 120 # secs max_staging_runtime: 120 # secs


# Create a secure environment for staging
secure: false
new_stager_percent: 100
new_stager_email_regexp: .*@vmware.com

auth: auth:
user: zxsfhgjg user: zxsfhgjg
password: ZNVfdase9 password: ZNVfdase9
Expand Down

This file was deleted.

0 comments on commit 352886c

Please sign in to comment.