KVM guests: set block queue depth back to default

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 6a91bcf5b672460358e06f68a60107371a2d03f1..ebe2f824dc5957507813a8e4129b29437380617b 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -64,6 +64,7 @@ default_attributes(
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },

+      :dodobas => { :status => :user },

       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 
       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 


@@ -95,7 +96,7 @@ default_attributes(
   :apt => {
     :sources => [
       "brightbox-ruby-ng",
   :apt => {
     :sources => [
       "brightbox-ruby-ng",

-      "ubuntugis-stable", "ubuntugis-unstable",
+      "ubuntugis-stable",

       "mapnik-v210"
     ]
   },
       "mapnik-v210"
     ]
   },


@@ -127,13 +128,9 @@ default_attributes(
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       },
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       },

-      :welcome => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "welcome-2"
-      },
-      :rails4 => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails4"
+      :jsrouting => {
+        :repository => "git://github.com/systemed/openstreetmap-website.git",
+        :revision => "routing"

       }
     }
   },
       }
     }
   },