Merge remote-tracking branch 'github/pull/451'

[chef.git] / roles / rhaegal.rb

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 6ff245d85a6e24b199177643e8c3356ff4caa935..00fce56cf4345c2d21baaadc745700ccc9287abb 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -29,7 +29,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "enp1s0f0",
+        :interface => "eno1",

         :role => :external,
         :family => :inet,
         :address => "10.5.0.77",
         :role => :external,
         :family => :inet,
         :address => "10.5.0.77",


@@ -37,14 +37,9 @@ default_attributes(
         :gateway => "10.5.0.1",
         :public_address => "161.53.248.77"
       }
         :gateway => "10.5.0.1",
         :public_address => "161.53.248.77"
       }

-    },
-    :nameservers => [
-      "10.5.0.7",
-      "8.8.8.8"
-    ]
+    }

   },
   :postgresql => {
   },
   :postgresql => {

-    :versions => ["10"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -64,8 +59,8 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"

     },
     :styles => {
       :default => {
     },
     :styles => {
       :default => {