Permalink
Browse files

Merge "Add submodules for router,stager,warden,cc"

  • Loading branch information...
2 parents a753120 + 79e43e1 commit 312c201b007020bbed2ad33e03516c3674593fe8 Patrick Bozeman committed with Gerrit Code Review May 31, 2012
View
@@ -18,4 +18,16 @@
url = git@github.com:cloudfoundry/dea.git
[submodule "src/health_manager_next"]
path = src/health_manager_next
- url = git://github.com/cloudfoundry/health_manager.git
+ url = git://github.com/cloudfoundry/health_manager.git
+[submodule "src/router"]
+ path = src/router
+ url = git@github.com:cloudfoundry/router.git
+[submodule "src/stager"]
+ path = src/stager
+ url = git@github.com:cloudfoundry/stager.git
+[submodule "src/warden"]
+ path = src/warden
+ url = git@github.com:cloudfoundry/warden.git
+[submodule "src/cloud_controller"]
+ path = src/cloud_controller
+ url = git@github.com:cloudfoundry/cloud_controller.git
@@ -125,7 +125,7 @@ case $1 in
/var/vcap/packages/syslog_aggregator/setup_syslog_forwarder.sh $CONFIG_DIR
<% end %>
- exec chpst -u vcap:vcap $CC_PACKAGE_DIR/bin/cloud_controller \
+ exec chpst -u vcap:vcap $CC_PACKAGE_DIR/cloud_controller/bin/cloud_controller \
>>$LOG_DIR/cloud_controller.stdout.log \
2>>$LOG_DIR/cloud_controller.stderr.log
@@ -30,7 +30,7 @@ case $1 in
/var/vcap/packages/syslog_aggregator/setup_syslog_forwarder.sh $HM_CONF_DIR
<% end %>
- exec chpst -u vcap:vcap $HM_PACKAGE_DIR/bin/health_manager \
+ exec chpst -u vcap:vcap $HM_PACKAGE_DIR/health_manager/bin/health_manager \
-c $HM_JOB_DIR/config/health_manager.yml \
>>$LOG_DIR/health_manager.stdout.log \
2>>$LOG_DIR/health_manager.stderr.log
@@ -49,7 +49,7 @@ case $1 in
/var/vcap/packages/syslog_aggregator/setup_syslog_forwarder.sh $CONF_DIR
<% end %>
- exec /var/vcap/packages/router/bin/router \
+ exec /var/vcap/packages/router/router/bin/router \
-c /var/vcap/jobs/router/config/router.yml \
>>$LOG_DIR/router.stdout.log \
2>>$LOG_DIR/router.stderr.log
@@ -3,14 +3,13 @@ set -e
cd ${BUILD_DIR}
-cp -a core/cloud_controller .
-cp -a core/health_manager .
-cp -a core/bin .
-cp -a core/common .
+mv cloud_controller cchm_meta
+mv cchm_meta/cloud_controller .
+mv cchm_meta/health_manager .
pkg_utils/vendor.sh cloud_controller
pkg_utils/vendor.sh health_manager
-rm -rf core
+rm -rf cchm_meta
rm -rf cloud_controller/spec
-rm -rf pkg_utils
+rm -rf pkg_utils
@@ -7,9 +7,6 @@ dependencies:
- ruby
- insight_agent
files:
-- core/bin/health_manager
-- core/bin/cloud_controller
-- core/cloud_controller/**/*
-- core/health_manager/**/*
-- core/common/**/*
+- cloud_controller/cloud_controller/**/*
+- cloud_controller/health_manager/**/*
- pkg_utils/*
@@ -3,8 +3,6 @@ set -e
cd ${BUILD_DIR}
-cp -a core/router .
-cp -a core/bin .
-cp -a core/common .
+pkg_utils/vendor.sh router
-rm -rf core
+rm -rf pkg_utils
View
@@ -3,6 +3,6 @@ name: router
dependencies:
- ruby
files:
-- core/bin/router
-- core/router/**/*
-- core/common/**/*
+- router/{Gemfile,Gemfile.lock}
+- router/{bin,ext,lib}/**/*
+- pkg_utils/*
@@ -3,5 +3,6 @@ set -e
cd ${BUILD_DIR}
-cp -a core/stager .
-rm -rf core
+pkg_utils/vendor.sh stager
+
+rm -rf pkg_utils
View
@@ -7,4 +7,6 @@ dependencies:
- ruby
- insight_agent
files:
-- core/stager/**/*
+- stager/{Gemfile,Gemfile.lock}
+- stager/{bin,lib}/**/*
+- pkg_utils/*
@@ -3,8 +3,10 @@ set -e
cd ${BUILD_DIR}
-cp -a core/warden .
+mv warden warden_meta
+mv warden_meta/warden .
+rm -rf warden_meta
-ruby core/common/bin/fetch_gems /warden/Gemfile ./warden/Gemfile.lock ./warden/vendor/cache
+pkg_utils/vendor.sh warden
-rm -rf core
+rm -rf pkg_utils
View
@@ -3,5 +3,5 @@ name: warden
dependencies:
- ruby
files:
-- core/warden/**/*
-- core/common/bin/fetch_gems
+- warden/warden/**
+- pkg_utils/*
Submodule cloud_controller added at 873dcf
Submodule router added at 70368e
Submodule stager added at 6cafe1
Submodule warden added at 721dee

0 comments on commit 312c201

Please sign in to comment.