fix syntax

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 99bc7b2b156084329a02c59d42429aa26b384ddd..bf2a5ceeaca7bc7aac02b768358562cf3d83c532 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -2,21 +2,7 @@ name "orm"
 description "Master role applied to orm"
 
 default_attributes(
 description "Master role applied to orm"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :devices => {
   :devices => {

-    :ssd_samsung => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_840_PRO_Series_*",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
-    },

     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",


@@ -41,26 +27,16 @@ default_attributes(
         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {

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

         :role => :external,
         :family => :inet,
         :address => "130.117.76.3"
       },
         :role => :external,
         :family => :inet,
         :address => "130.117.76.3"
       },

-      # :external_ipv6 => {
-      #   :interface => "bond0.3",
-      #   :role => :external,
-      #   :family => :inet6,
-      #   :address => "2001:978:2:2C::172:1003"
-      # },
-    }
-  },
-  :postgresql => {
-    :versions => ["9.6"],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
+      :external_ipv6 => {
+        :interface => "bond0.2",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:978:2:2C::172:3"

       }
     }
   },
       }
     }
   },


@@ -72,32 +48,10 @@ default_attributes(
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }

-  },
-  :tile => {
-    :database => {
-      :cluster => "9.6/main",
-      :postgis => "2.3"
-    },
-    :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 }
-        ]
-      }
-    }
-  }
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )