Enable crm-staging on dribble and add user kevin

[chef.git] / roles / pyrene.rb

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index ebc56ae9c6f44fa0e6171663ed825da634709265..1b211f033b5088ca5526eea6db32ca18576d1898 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -22,17 +22,15 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "eno1",
         :role => :external,
         :interface => "eno1",
         :role => :external,

-        :family => :inet,
-        :address => "140.211.167.98"
-      },
-      :external_ipv6 => {
-        :interface => "eno1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2605:bc80:3010:700::8cd3:a762"
+        :inet => {
+          :address => "140.211.167.98"
+        },
+        :inet6 => {
+          :address => "2605:bc80:3010:700::8cd3:a762"
+        }

       }
     }
   },
       }
     }
   },


@@ -56,7 +54,7 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "12/main",
+      :cluster => "14/main",

       :postgis => "3"
     },
     :mapnik => "3.1",
       :postgis => "3"
     },
     :mapnik => "3.1",


@@ -66,7 +64,7 @@ default_attributes(
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
       }
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
       }

-    }
+    },

   }
 )
 
   }
 )