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.
NUBIC · May 29, 2013 · 5e9fccf · 5e9fccf
1 parent 70b2927
commit 5e9fccf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"