Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[dev_setup] move cc/dea/.. to be vcap submodules

Change-Id: Iba85188e7d4143b205787e661d08ee83fc1b52a9
  • Loading branch information...
commit 499c1f8d8fc850f156407f1baf1f68616844928d 1 parent a023a09
authored
12  .gitmodules
@@ -10,3 +10,15 @@
10 10
 [submodule "acm"]
11 11
 	path = acm
12 12
 	url = https://github.com/cloudfoundry/acm.git
  13
+[submodule "cloud_controller"]
  14
+	path = cloud_controller
  15
+	url = https://github.com/cloudfoundry/cloud_controller.git
  16
+[submodule "router"]
  17
+	path = router
  18
+	url = https://github.com/cloudfoundry/router.git
  19
+[submodule "dea"]
  20
+	path = dea
  21
+	url = https://github.com/cloudfoundry/dea.git
  22
+[submodule "stager"]
  23
+	path = stager
  24
+	url = https://github.com/cloudfoundry/stager.git
1  cloud_controller
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 18703ef05d05f1c824682634a17cf6a6948e3170
1  dea
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 6945c009778bc804ccb177719c1611b346a6b7b9
2  dev_setup/bin/vcap
@@ -339,7 +339,7 @@ end
339 339
 args = opts_parser.parse!(args)
340 340
 ENV['CLOUD_FOUNDRY_CONFIG_PATH'] = $config_dir
341 341
 
342  
-DIR = File.join($vcap_home, "vcap", "bin")
  342
+DIR = File.join($vcap_home, "bin")
343 343
 
344 344
 SERVICE_DIR = File.join(DIR, '/services')
345 345
 unless $log_dir
2  dev_setup/bin/vcap_dev
@@ -107,7 +107,7 @@ def exec_cmd(cmd)
107 107
 end
108 108
 
109 109
 ruby_binary = File.join(ruby_bin_dir, "ruby")
110  
-vcap_home = File.join(deployment_info["cloudfoundry_home"])
  110
+vcap_home = File.join(deployment_info["cloudfoundry_home"], "vcap")
111 111
 vcap_launch = File.join(script_dir, "vcap")
112 112
 
113 113
 puts "Using cloudfoundry config from #{deployment_config_path}"
36  dev_setup/bin/vcap_dev_setup
@@ -149,30 +149,20 @@ ${GEM} list -i rake -i || sudo ${GEM} install rake -q --no-ri --no-rdoc > /dev/n
149 149
 echo "Installing git..."
150 150
 run_cmd apt-get $APT_CONFIG install -qym git-core
151 151
 
152  
-readonly CORE_REPOS=(cloud_controller dea router stager)
153  
-
154 152
 [ -d $CLOUDFOUNDRY_HOME ] || mkdir $CLOUDFOUNDRY_HOME
155  
-for REPO in vcap "${CORE_REPOS[@]}"; do
156  
-  if [ ! -d $CLOUDFOUNDRY_HOME/$REPO ]; then
157  
-    if ! (cd $CLOUDFOUNDRY_HOME
158  
-      git clone --no-checkout $VCAP_REPO_BASE/$REPO
159  
-      cd $REPO
160  
-      git checkout $VCAP_REPO_BRANCH
161  
-      git submodule update --recursive --init
162  
-    ); then
163  
-      echo "Unable to clone cloudfoundry $REPO repo."
164  
-      exit 1
165  
-    fi
166  
-  else
167  
-    clear_bundler_settings $CLOUDFOUNDRY_HOME/$REPO
  153
+REPO=vcap
  154
+if [ ! -d $CLOUDFOUNDRY_HOME/${REPO} ]; then
  155
+  if ! (cd $CLOUDFOUNDRY_HOME
  156
+    git clone --no-checkout $VCAP_REPO_BASE/$REPO
  157
+    cd $REPO
  158
+    git checkout $VCAP_REPO_BRANCH
  159
+    git submodule update --recursive --init
  160
+  ); then
  161
+    echo "Unable to clone cloudfoundry $REPO repo."
  162
+    exit 1
168 163
   fi
169  
-done
170  
-
171  
-
172  
-# Our deployment code needs this gem. Using bundler seems like an overkill for
173  
-# the deployment code. So for now just manually install the required gem.
174  
-if ! gem list rake -i > /dev/null; then
175  
-  gem install rake -q --no-ri --no-rdoc > /dev/null 2>&1
  164
+else
  165
+  clear_bundler_settings $CLOUDFOUNDRY_HOME/$REPO
176 166
 fi
177 167
 
178 168
 # Launch chef
@@ -190,6 +180,6 @@ if [ -n "$CONFIG_FILE" ]; then
190 180
 fi
191 181
 
192 182
 echo ""
193  
-echo "Lanching chef..."
  183
+echo "Launching chef..."
194 184
 sleep 3
195 185
 $CLOUDFOUNDRY_HOME/vcap/dev_setup/lib/chefsolo_launch.rb $ARGS
2  dev_setup/cookbooks/cloud_controller/recipes/default.rb
@@ -36,7 +36,7 @@
36 36
    mode 0644
37 37
 end
38 38
 
39  
-cf_bundle_install(File.expand_path(File.join("cloud_controller", "cloud_controller"), node[:cloudfoundry][:home]))
  39
+cf_bundle_install(File.expand_path(File.join("cloud_controller", "cloud_controller"), node[:cloudfoundry][:path]))
40 40
 
41 41
 cf_pg_reset_user_password(:ccdb)
42 42
 
2  dev_setup/cookbooks/dea/recipes/default.rb
@@ -35,4 +35,4 @@
35 35
   mode 0644
36 36
 end
37 37
 
38  
-cf_bundle_install(File.join(node[:cloudfoundry][:home], "dea"))
  38
+cf_bundle_install(File.join(node[:cloudfoundry][:path], "dea"))
2  dev_setup/cookbooks/nginx/attributes/default.rb
@@ -24,7 +24,7 @@
24 24
 default[:lua][:path]    = File.join(node[:deployment][:home], "deploy", "lua", "lua-#{lua[:version]}")
25 25
 default[:lua][:cjson_id]  = "eyJzaWciOiJ5OGp2YWlvUWptNXhrc3hTODdYQ0x0N0JXemM9Iiwib2lkIjoi%0ANGU0ZTc4YmNhNjFlMTIxMjA0ZTRlODZlZWJlNTkxMDUwMThmMjViZGE3MDYi%0AfQ==%0A"
26 26
 default[:lua][:module_path]    = File.join(lua[:path], 'lib', 'lua', lua[:simple_version])
27  
-default[:lua][:plugin_source_path] = File.join(node["cloudfoundry"]["home"], "router", "ext", "nginx")
  27
+default[:lua][:plugin_source_path] = File.join(node["cloudfoundry"]["path"], "router", "ext", "nginx")
28 28
 default[:lua][:checksums][:source] = "b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a"
29 29
 default[:lua][:checksums][:cjson_source] = "9659fef3d4d3bc08b3fbd7827636dad6fb236c83d277b632879cb354f1b2e942"
30 30
 
2  dev_setup/cookbooks/router/recipes/default.rb
@@ -11,4 +11,4 @@
11 11
   mode 0644
12 12
 end
13 13
 
14  
-cf_bundle_install(File.expand_path("router", node[:cloudfoundry][:home]))
  14
+cf_bundle_install(File.expand_path("router", node[:cloudfoundry][:path]))
2  dev_setup/cookbooks/stager/recipes/default.rb
@@ -21,4 +21,4 @@
21 21
   mode 0644
22 22
 end
23 23
 
24  
-cf_bundle_install(File.expand_path("stager", node[:cloudfoundry][:home]))
  24
+cf_bundle_install(File.expand_path("stager", node[:cloudfoundry][:path]))
4  dev_setup/lib/vcap_components.rb
@@ -205,14 +205,14 @@ def pid_file
205 205
 
206 206
 class UAAComponent < CoreComponent
207 207
   def initialize(*args)
208  
-    @path = File.join($vcap_home, "vcap", "bin", "uaa")
  208
+    @path = File.join($vcap_home, "bin", "uaa")
209 209
     super
210 210
   end
211 211
 end
212 212
 
213 213
 class ACMComponent < CoreComponent
214 214
   def initialize(*args)
215  
-    @path = File.join($vcap_home, "vcap", "bin", "acm")
  215
+    @path = File.join($vcap_home, "bin", "acm")
216 216
     super
217 217
   end
218 218
 end
1  router
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 346867cfa72a7d0e9d8f80fa4cfa95261834c260
1  stager
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 9430c04b31bcc4d3e151c15e89bcaf1e0f7f6fe9

Git Notes

review

Code-Review+2: Anfernee Gui <agui@vmware.com>
Code-Review+1: Figo Feng <ffeng@vmware.com>
Verified+1: CI Master <cf-ci@rbcon.com>
Submitted-by: Haipeng Wu <hwu@rbcon.com>
Submitted-at: Mon, 22 Oct 2012 05:02:46 +0000
Reviewed-on: http://reviews.cloudfoundry.org/9748
Project: vcap
Branch: refs/heads/master

0 notes on commit 499c1f8

Please sign in to comment.
Something went wrong with that request. Please try again.