apply changes to all sites, not just the private

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 3be0a2e6dd4188301e8052209f7381d5fc15a80d..e8caaf82e9a17f6351932df07cf90409794c2771 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -28,27 +28,26 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.3",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.98"
+        :address => "130.117.76.3"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:630:12:500:2e0:81ff:fec5:2a8c"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => ["9.1"],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
+        :address => "2001:978:2:2C::172:3"

       }
     }
   },
       }
     }
   },


@@ -60,17 +59,6 @@ default_attributes(
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }

-  },
-  :tile => {
-    :node_file => "/store/database/nodes",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
-          { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
-        ]
-      }
-    }

   }
 )
 
   }
 )
 


@@ -81,7 +69,6 @@ override_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ic]",
-  "role[tyan-s7010]",
-  "role[tile]"
+  "role[equinix]",
+  "role[tyan-s7010]"

 )
 )