Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / roles / karm.rb

diff --git a/roles/karm.rb b/roles/karm.rb
index 8f0ce7a234de14536cf422a0bbc8028ad677c389..04b5a925be475beef37f241c1d3c8f714290a23c 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,12 +2,6 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
 description "Master role applied to karm"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -16,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.50",
         :bond => {
         :family => :inet,
         :address => "10.0.48.50",
         :bond => {

-          :slaves => %w[enp1s0f0 enp1s0f1]
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]

         }
       }
     }
         }
       }
     }


@@ -46,6 +40,5 @@ default_attributes(
 
 run_list(
   "role[equinix]",
 
 run_list(
   "role[equinix]",

-  "role[db-master]",
-  "role[db-backup]"
+  "role[db-slave]"

 )
 )