From 5e9fccfa035640eb0c291889e3e132f3218934f1 Mon Sep 17 00:00:00 2001
From: David Yip <yipdw@northwestern.edu>
Date: Wed, 29 May 2013 14:36:38 -0500
Subject: [PATCH] Move Ruby version configuration out of roles.

One node may have multiple Ruby-using roles, but we're trying to keep
the Ruby environment the same for all those roles.
---
 Vagrantfile               | 8 ++++++++
 chef/roles/ncs_app.rb     | 6 +-----
 chef/roles/ncs_cas.rb     | 6 +-----
 chef/roles/ncs_cases.rb   | 6 +-----
 chef/roles/ncs_ops_psc.rb | 6 +-----
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 19f0305..c4545fa 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -39,6 +39,14 @@ def ncs_navigator_configuration
         "password" => "CAS#pass"
       }
     },
+    "passenger" => {
+      "rvm_ruby_string" => "ruby-1.9.3-p429"
+    },
+    "rvm" => {
+      "rubies" => ["ruby-1.9.3-p429"],
+      "version" => "1.20.12",
+      "upgrade" => "1.20.12"
+    },
     "ncs_navigator" => {
       "cas" => {
         "base_url" => "#{cas_url}/cas",
diff --git a/chef/roles/ncs_app.rb b/chef/roles/ncs_app.rb
index 7fd6ea2..df7df18 100644
--- a/chef/roles/ncs_app.rb
+++ b/chef/roles/ncs_app.rb
@@ -29,7 +29,6 @@
     "shell" => "/bin/bash"
   },
   "passenger" => {
-    "rvm_ruby_string" => "ruby-1.9.3-p327",
     "version" => "3.0.12",
     "max_pool_size" => 10
   },
@@ -45,16 +44,13 @@
   },
   "rvm" => {
     "default_ruby" => "system",
-    "rubies" => ["ruby-1.9.3-p327"],
     "global_gems" => [
         { "name" => "bundler", "version" => "~> 1.1" }
      ],
      "rvmrc" => {
         'rvm_project_rvmrc' => '0'
      },
-     "branch" => "none",
-     "version" => "1.16.20",
-     "upgrade" => "1.16.20"
+     "branch" => "none"
   },
   "bcdatabase" => {
     "version" => "1.2.1"
diff --git a/chef/roles/ncs_cas.rb b/chef/roles/ncs_cas.rb
index 6ce4f95..3a96cb5 100644
--- a/chef/roles/ncs_cas.rb
+++ b/chef/roles/ncs_cas.rb
@@ -27,20 +27,16 @@
     }
   },
   "passenger" => {
-    "rvm_ruby_string" => "ruby-1.9.3-p327",
     "version" => "3.0.12"
   },
   "rvm" => {
     "default_ruby" => "system",
-    "rubies" => ["ruby-1.9.3-p327"],
     "global_gems" => [
         { "name" => "bundler", "version" => "~> 1.1" }
      ],
      "rvmrc" => {
         'rvm_project_rvmrc' => '0'
      },
-     "branch" => "none",
-     "version" => "1.16.20",
-     "upgrade" => "1.16.20"
+     "branch" => "none"
   }
 )
diff --git a/chef/roles/ncs_cases.rb b/chef/roles/ncs_cases.rb
index 6a94253..99849f1 100644
--- a/chef/roles/ncs_cases.rb
+++ b/chef/roles/ncs_cases.rb
@@ -47,22 +47,18 @@
     ]
   },
   "passenger" => {
-    "rvm_ruby_string" => "ruby-1.9.3-p327",
     "version" => "3.0.12",
     "max_pool_size" => 10
   },
   "rvm" => {
     "default_ruby" => "system",
-    "rubies" => ["ruby-1.9.3-p327"],
     "global_gems" => [
         { "name" => "bundler", "version" => "~> 1.1" }
      ],
      "rvmrc" => {
         'rvm_project_rvmrc' => '0'
      },
-     "branch" => "none",
-     "version" => "1.16.20",
-     "upgrade" => "1.16.20"
+     "branch" => "none"
   },
   "bcdatabase" => {
     "version" => "1.2.1"
diff --git a/chef/roles/ncs_ops_psc.rb b/chef/roles/ncs_ops_psc.rb
index d8cc00c..cf9a644 100644
--- a/chef/roles/ncs_ops_psc.rb
+++ b/chef/roles/ncs_ops_psc.rb
@@ -36,22 +36,18 @@
     "shell" => "/bin/bash"
   },
   "passenger" => {
-    "rvm_ruby_string" => "ruby-1.9.3-p327",
     "version" => "3.0.12",
     "max_pool_size" => 10
   },
   "rvm" => {
     "default_ruby" => "system",
-    "rubies" => ["ruby-1.9.3-p327"],
     "global_gems" => [
         { "name" => "bundler", "version" => "~> 1.1" }
      ],
      "rvmrc" => {
         'rvm_project_rvmrc' => '0'
      },
-     "branch" => "none",
-     "version" => "1.16.20",
-     "upgrade" => "1.16.20"
+     "branch" => "none"
   },
   "bcdatabase" => {
     "version" => "1.2.1"