Permalink
Browse files

rename to vblob in dev_setup

Change-Id: I7c8f7bf083dfcd1eb181e8b3821cabbd01a388e7
  • Loading branch information...
1 parent 199a665 commit 9d8d475dc5f7313e1f3f272210bbab9f47f52b01 SonicWang committed Feb 24, 2012
Showing with 92 additions and 108 deletions.
  1. +0 −4 bin/services/blob_gateway
  2. +0 −4 bin/services/blob_node
  3. +4 −0 bin/services/vblob_gateway
  4. +4 −0 bin/services/vblob_node
  5. +1 −1 cloud_controller/config/cloud_controller.yml
  6. +2 −2 dev_setup/bin/vcap
  7. +0 −8 dev_setup/cookbooks/blob/attributes/default.rb
  8. +0 −28 dev_setup/cookbooks/blob/recipes/default.rb
  9. +0 −17 dev_setup/cookbooks/blob/templates/default/blob_node.yml.erb
  10. +1 −1 dev_setup/cookbooks/cloud_controller/attributes/default.rb
  11. 0 dev_setup/cookbooks/{blob → vblob}/README.rdoc
  12. +8 −0 dev_setup/cookbooks/vblob/attributes/default.rb
  13. +1 −1 dev_setup/cookbooks/{blob → vblob}/metadata.rb
  14. 0 dev_setup/cookbooks/{blob/packages/blob-src.tgz → vblob/packages/vblob-src.tgz}
  15. +28 −0 dev_setup/cookbooks/vblob/recipes/default.rb
  16. +2 −2 dev_setup/cookbooks/{blob → vblob}/recipes/gateway.rb
  17. +2 −2 dev_setup/cookbooks/{blob → vblob}/recipes/node.rb
  18. +5 −5 ...oks/{blob/templates/default/blob_gateway.yml.erb → vblob/templates/default/vblob_gateway.yml.erb}
  19. +17 −0 dev_setup/cookbooks/vblob/templates/default/vblob_node.yml.erb
  20. +3 −3 dev_setup/deployments/README
  21. +3 −3 dev_setup/deployments/sample/custom_runtimes/custom_runtime2.yml
  22. +0 −4 dev_setup/deployments/sample/multihost_mongodb/rest.yml
  23. +0 −4 dev_setup/deployments/sample/multihost_mysql/rest.yml
  24. +0 −4 dev_setup/deployments/sample/multihost_redis/rest.yml
  25. +0 −4 dev_setup/deployments/sample/multihost_router/rest.yml
  26. +2 −2 dev_setup/lib/chefsolo_launch.rb
  27. +1 −1 dev_setup/lib/job_manager.rb
  28. +3 −3 dev_setup/roles/{blob_gateway.json → vblob_gateway.json}
  29. +4 −4 dev_setup/roles/{blob_node.json → vblob_node.json}
  30. +1 −1 rakelib/core_components.rake
View
4 bin/services/blob_gateway
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright (c) 2009-2011 VMware, Inc.
-
-exec(File.expand_path("../../../services/blob/bin/blob_gateway", __FILE__), *ARGV)
View
4 bin/services/blob_node
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright (c) 2009-2011 VMware, Inc.
-
-exec(File.expand_path("../../../services/blob/bin/blob_node", __FILE__), *ARGV)
View
4 bin/services/vblob_gateway
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# Copyright (c) 2009-2011 VMware, Inc.
+
+exec(File.expand_path("../../../services/vblob/bin/vblob_gateway", __FILE__), *ARGV)
View
4 bin/services/vblob_node
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# Copyright (c) 2009-2011 VMware, Inc.
+
+exec(File.expand_path("../../../services/vblob/bin/vblob_node", __FILE__), *ARGV)
View
2 cloud_controller/config/cloud_controller.yml
@@ -131,7 +131,7 @@ builtin_services:
token: "0xdeadbeef"
neo4j:
token: "0xdeadbeef"
- blob:
+ vblob:
token: "0xdeadbeef"
atmos:
token: "0xdeadbeef"
View
4 dev_setup/bin/vcap
@@ -15,7 +15,7 @@
# - redis
# - mysql
# - mongo
-#
+# - vblob
require 'yaml'
require 'fileutils'
@@ -313,7 +313,7 @@ module Run
puts
kill_service_instances('neo4j', /neo4j/ )
puts
- kill_service_instances('blob', /server\.js/); #the entry point is server.js for blob
+ kill_service_instances('vblob', /server\.js/); #the entry point is server.js for vblob
puts
puts "Cleaning shared directories:"
View
8 dev_setup/cookbooks/blob/attributes/default.rb
@@ -1,8 +0,0 @@
-include_attribute "deployment"
-default[:blob][:version] = "1.0"
-default[:blob][:path] = File.join(node[:deployment][:home], "deploy", "blob")
-
-default[:blob_node][:index] = "0"
-default[:blob_node][:available_memory] = "4096"
-default[:blob_node][:max_memory] = "256"
-default[:blob_node][:token] = "changeblobtoken"
View
28 dev_setup/cookbooks/blob/recipes/default.rb
@@ -1,28 +0,0 @@
-#
-# Cookbook Name:: blob
-# Recipe:: default
-#
-# Copyright 2011, VMware
-#
-#
-directory File.join(node[:blob][:path], "bin") do
- owner node[:deployment][:user]
- group node[:deployment][:group]
- mode "0755"
- recursive true
- action :create
-end
-
-bash "Install Blob" do
- cwd File.join("", "tmp")
- user node[:deployment][:user]
- code <<-EOH
- cp #{File.join(node[:blob_dir], "blob-src.tgz")} .
- tar xvzf blob-src.tgz
- cd blob-src
- cp -R * #{File.join(node[:blob][:path], "bin")}
- EOH
- not_if do
- ::File.exists?(File.join(node[:blob][:path], "bin", "server.js"))
- end
-end
View
17 dev_setup/cookbooks/blob/templates/default/blob_node.yml.erb
@@ -1,17 +0,0 @@
----
-local_db: sqlite3:/var/vcap/services/blob/blob_node.db
-mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
-index: <%= node[:blob_node][:index] %>
-base_dir: /var/vcap/services/blob/instances
-blobd_log_dir: /var/vcap/services/blob/logs
-pid: /var/vcap/sys/run/blob_node.pid
-available_memory: <%= node[:blob_node][:available_memory] %>
-max_memory: <%= node[:blob_node][:max_memory] %>
-node_id: <%= "blob_node_#{node[:blob_node][:index]}" %>
-blobd_path: <%= File.join(node[:blob][:path], "bin") %>
-nodejs_path: <%= File.join(node[:nodejs][:path], "bin", "node") %>
-port_range:
- first: 45001
- last: 65000
-logging:
- level: debug
View
2 dev_setup/cookbooks/cloud_controller/attributes/default.rb
@@ -16,4 +16,4 @@
default[:cloud_controller][:staging][:java_web] = "java_web.yml"
# Default builtin services
-default[:cloud_controller][:builtin_services] = ["redis", "mongodb", "mysql", "neo4j", "blob"]
+default[:cloud_controller][:builtin_services] = ["redis", "mongodb", "mysql", "neo4j", "vblob"]
View
0 dev_setup/cookbooks/blob/README.rdoc → dev_setup/cookbooks/vblob/README.rdoc
File renamed without changes.
View
8 dev_setup/cookbooks/vblob/attributes/default.rb
@@ -0,0 +1,8 @@
+include_attribute "deployment"
+default[:vblob][:version] = "1.0"
+default[:vblob][:path] = File.join(node[:deployment][:home], "deploy", "vblob")
+
+default[:vblob_node][:index] = "0"
+default[:vblob_node][:available_memory] = "4096"
+default[:vblob_node][:max_memory] = "256"
+default[:vblob_node][:token] = "changevblobtoken"
View
2 dev_setup/cookbooks/blob/metadata.rb → dev_setup/cookbooks/vblob/metadata.rb
@@ -1,6 +1,6 @@
maintainer "VMware"
maintainer_email "support@vmware.com"
license "Apache 2.0"
-description "Installs/Configures Blob"
+description "Installs/Configures vBlob"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
version "0.0.1"
View
0 ...etup/cookbooks/blob/packages/blob-src.tgz → ...up/cookbooks/vblob/packages/vblob-src.tgz
File renamed without changes.
View
28 dev_setup/cookbooks/vblob/recipes/default.rb
@@ -0,0 +1,28 @@
+#
+# Cookbook Name:: vblob
+# Recipe:: default
+#
+# Copyright 2011, VMware
+#
+#
+directory File.join(node[:vblob][:path], "bin") do
+ owner node[:deployment][:user]
+ group node[:deployment][:group]
+ mode "0755"
+ recursive true
+ action :create
+end
+
+bash "Install vBlob" do
+ cwd File.join("", "tmp")
+ user node[:deployment][:user]
+ code <<-EOH
+ cp #{File.join(node[:vblob_dir], "vblob-src.tgz")} .
+ tar xvzf vblob-src.tgz
+ cd vblob-src
+ cp -R * #{File.join(node[:vblob][:path], "bin")}
+ EOH
+ not_if do
+ ::File.exists?(File.join(node[:vblob][:path], "bin", "server.js"))
+ end
+end
View
4 dev_setup/cookbooks/blob/recipes/gateway.rb → dev_setup/cookbooks/vblob/recipes/gateway.rb
@@ -5,6 +5,6 @@
# Copyright 2011, VMware
#
-cloudfoundry_service "blob" do
- components ["blob_gateway"]
+cloudfoundry_service "vblob" do
+ components ["vblob_gateway"]
end
View
4 dev_setup/cookbooks/blob/recipes/node.rb → dev_setup/cookbooks/vblob/recipes/node.rb
@@ -5,6 +5,6 @@
# Copyright 2011, VMware
#
-cloudfoundry_service "blob" do
- components ["blob_node"]
+cloudfoundry_service "vblob" do
+ components ["vblob_node"]
end
View
10 ...ob/templates/default/blob_gateway.yml.erb → ...b/templates/default/vblob_gateway.yml.erb
@@ -1,16 +1,16 @@
---
cloud_controller_uri: <%= node[:cloud_controller][:service_api_uri] %>
service:
- name: blob
+ name: vblob
version: "1.0"
- description: 'Blob Service'
+ description: 'vBlob Service'
plans: ['free']
- tags: ['blob', 'blob-1.0', 'nosql']
+ tags: ['vblob', 'vblob-1.0', 'nosql']
host: localhost
index: 0
-token: <%= node[:blob_node][:token] %>
+token: <%= node[:vblob_node][:token] %>
mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
-pid: /var/vcap/sys/run/blob_service.pid
+pid: /var/vcap/sys/run/vblob_service.pid
logging:
level: debug
# allow_over_provisioning: false
View
17 dev_setup/cookbooks/vblob/templates/default/vblob_node.yml.erb
@@ -0,0 +1,17 @@
+---
+local_db: sqlite3:/var/vcap/services/vblob/vblob_node.db
+mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/
+index: <%= node[:vblob_node][:index] %>
+base_dir: /var/vcap/services/vblob/instances
+vblobd_log_dir: /var/vcap/services/vblob/logs
+pid: /var/vcap/sys/run/vblob_node.pid
+available_memory: <%= node[:vblob_node][:available_memory] %>
+max_memory: <%= node[:vblob_node][:max_memory] %>
+node_id: <%= "vblob_node_#{node[:vblob_node][:index]}" %>
+vblobd_path: <%= File.join(node[:vblob][:path], "bin") %>
+nodejs_path: <%= File.join(node[:nodejs][:path], "bin", "node") %>
+port_range:
+ first: 45001
+ last: 65000
+logging:
+ level: debug
View
6 dev_setup/deployments/README
@@ -72,8 +72,8 @@ Here is a sampling of the currently supported jobs
- mongodb_gateway
- neo4j_node
- neo4j_gateway
- - blob_node
- - blob_gateway
+ - vblob_node
+ - vblob_gateway
The easiest way to get started on your multihost setup is to start customizing
the various example config files that exist in this directory.
@@ -84,4 +84,4 @@ Router can be configured to run on different hosts. The following components how
should all run on the same host
- cloud_controller
- health_manager
-- service gateways i.e. mysql_gateway, mongodb_gateway, redis_gateway, neo4j_gateway and blob_gateway
+- service gateways i.e. mysql_gateway, mongodb_gateway, redis_gateway, neo4j_gateway and vblob_gateway
View
6 dev_setup/deployments/sample/custom_runtimes/custom_runtime2.yml
@@ -10,7 +10,7 @@ jobs:
- redis
- mongodb
- mysql
- - blob
+ - vblob
- router
- health_manager
- ccdb
@@ -23,9 +23,9 @@ jobs:
- mongodb_node:
index: "0"
- mongodb_gateway
- - blob_node:
+ - vblob_node:
index: "0"
- - blob_gateway
+ - vblob_gateway
# Shows that DEA runtimes could also be specified under the jobs/install or jobs/installed properties
- dea:
runtimes:
View
4 dev_setup/deployments/sample/multihost_mongodb/rest.yml
@@ -9,7 +9,6 @@ jobs:
- redis
- mongodb
- mysql
- - blob
- router
- health_manager
- redis_node:
@@ -20,6 +19,3 @@ jobs:
index: "0"
- mysql_gateway
- mongodb_gateway
- - blob_node:
- index: "0"
- - blob_gateway
View
4 dev_setup/deployments/sample/multihost_mysql/rest.yml
@@ -9,7 +9,6 @@ jobs:
- redis
- mongodb
- mysql
- - blob
- router
- health_manager
- ccdb
@@ -20,6 +19,3 @@ jobs:
- mongodb_node:
index: "0"
- mongodb_gateway
- - blob_node:
- index: "0"
- - blob_gateway
View
4 dev_setup/deployments/sample/multihost_redis/rest.yml
@@ -9,7 +9,6 @@ jobs:
- redis
- mongodb
- mysql
- - blob
- router
- health_manager
- redis_gateway
@@ -20,6 +19,3 @@ jobs:
- mongodb_gateway
- mongodb_node:
index: "0"
- - blob_node:
- index: "0"
- - blob_gateway
View
4 dev_setup/deployments/sample/multihost_router/rest.yml
@@ -10,7 +10,6 @@ jobs:
- redis
- mongodb
- mysql
- - blob
- health_manager
- redis_node:
index: "0"
@@ -23,6 +22,3 @@ jobs:
- mongodb_gateway
- mongodb_node:
index: "0"
- - blob_node:
- index: "0"
- - blob_gateway
View
4 dev_setup/lib/chefsolo_launch.rb
@@ -40,8 +40,8 @@
spec["cloudfoundry"] ||= {}
spec["cloudfoundry"]["home"] ||= cloudfoundry_home
spec["cloudfoundry"]["home"] = File.expand_path(spec["cloudfoundry"]["home"])
-# hack for blob, need to copy local binary package for deployment, must know script path
-spec["blob_dir"] = File.expand_path(File.join("..", "cookbooks", "blob", "packages"), script_dir)
+# hack for vblob, need to copy local binary package for deployment, must know script path
+spec["vblob_dir"] = File.expand_path(File.join("..", "cookbooks", "vblob", "packages"), script_dir)
if cloudfoundry_home != Deployment.get_cloudfoundry_home && cloudfoundry_home != spec["cloudfoundry"]["home"]
puts "Conflicting values for cloudfoundry home directory, command line argument says #{cloudfoundry_home} but config file says #{spec["cloudfoundry"]["home"]}"
View
2 dev_setup/lib/job_manager.rb
@@ -16,7 +16,7 @@ class JobManager
HM = "health_manager"
DEA = "dea"
- SERVICES = ["redis", "mysql", "mongodb", "neo4j", "blob"]
+ SERVICES = ["redis", "mysql", "mongodb", "neo4j", "vblob"]
SERVICES_NODE = SERVICES.map do |service|
"#{service}_node"
end
View
6 dev_setup/roles/blob_gateway.json → dev_setup/roles/vblob_gateway.json
@@ -1,11 +1,11 @@
{
- "name": "blob_gateway",
+ "name": "vblob_gateway",
"override_attributes": {},
"json_class": "Chef::Role",
- "description": "Blob service gateway",
+ "description": "vBlob service gateway",
"chef_type": "role",
"run_list" : [ "recipe[deployment]",
"recipe[essentials]",
"recipe[ruby]",
- "recipe[blob::gateway]"]
+ "recipe[vblob::gateway]"]
}
View
8 dev_setup/roles/blob_node.json → dev_setup/roles/vblob_node.json
@@ -1,13 +1,13 @@
{
- "name": "blob_node",
+ "name": "vblob_node",
"override_attributes": {},
"json_class": "Chef::Role",
- "description": "Blob service",
+ "description": "vBlob service",
"chef_type": "role",
"run_list" : ["recipe[deployment]",
"recipe[essentials]",
"recipe[ruby]",
"recipe[nodejs]",
- "recipe[blob]",
- "recipe[blob::node]"]
+ "recipe[vblob]",
+ "recipe[vblob::node]"]
}
View
2 rakelib/core_components.rake
@@ -9,7 +9,7 @@ module CoreComponents
end
def components
- %w[cloud_controller dea health_manager router stager services/redis services/mysql services/mongodb services/postgresql services/neo4j]
+ %w[cloud_controller dea health_manager router stager services/redis services/mysql services/mongodb services/postgresql services/neo4j services/vblob]
end
def dirs

0 comments on commit 9d8d475

Please sign in to comment.