merge ports config into main config

fuentesjr · Sep 1, 2011 · 21b7364 · 21b7364
1 parent 432205f
commit 21b7364
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/clouds.rb b/clouds.rb
@@ -4,7 +4,7 @@
 pool "ec2-setup" do  
   cloud "cassandra-cluster" do
     config = YAML::load(File.read("config.yml"))
-    ports = YAML::load(File.read("ports.yml"))
+    ports = config['ports']
 
     using :ec2
     keypair config['ec2']['keypair']

diff --git a/config.yml b/config.yml
@@ -12,3 +12,14 @@ ec2:
   type: m1.large # m1.large(7.5GB RAM, 850GB Disk), m1.xlarge(15GB RAM, 1,690GB Disk)
   keypair: ec2login
   zones: [us-west-1a]
+
+ports:
+  ssh:               22
+  thrift:            9160 # Cassandra clients
+  opscenter_web:     8888
+  job_tracking:      8012  # Brisk mapreduce job tracking clients
+  job_tracking_web:  50030 # Brisk mapreduce job tracking
+  task_tracking_web: 50060 # Brisk mapreduce task tracking
+
+  gossip:            7000
+  opscenter_agents:  8888
diff --git a/ports.yml b/ports.yml