fix rubocop offenses

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 1c90212df0dc0d64c4d42b52ac5218607106803c..f444ded4442a54e4dc67360a13fd5f58cb82b363 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,26 +4,27 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "p18p1",
-        :role => :external,
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
         :family => :inet,
-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "10.0.48.1",
+        :bond => {
+          :slaves => %w[p18p1 p18p2]
+        }
       },
-      :external_ipv6 => {
-        :interface => "p18p1",
+      :external_ipv4 => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
-      },
-      :internal_ipv4 => {
-        :interface => "p18p2",
-        :role => :internal,
         :family => :inet,
-        :address => "146.179.159.179",
-        :hwaddress => "0c:c4:7a:66:96:d3"
-      }
+        :address => "130.117.76.1"
+      },
+      # :external_ipv6 => {
+      #   :interface => "bond0.3",
+      #   :role => :external,
+      #   :family => :inet6,
+      #   :address => "2001:978:2:2C::172:1001"
+      # }
     }
   },
   :postgresql => {
@@ -58,14 +59,6 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
-    },
-    :fpm_pools => {
-      :www => {
-        :max_children => "120"
-      },
-      :bulk => {
-        :max_children => "20"
-      }
     }
   },
   :sysfs => {