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

[chef.git] / roles / sarel.rb

diff --git a/roles/sarel.rb b/roles/sarel.rb
index 69cb50dd21f2727582c7c898fc31cc25432e1ac4..647aa57c5e7a0f963c092729d2b426a6f6267dcc 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -3,21 +3,20 @@ description "Master role applied to sarel"
 
 default_attributes(
   :git => {
-    :allowed_nodes => "fqdn:*",
-    :user => "chefrepo",
-    :group => "chefrepo",
-    :backup => "chef-git"
+    :private_user => "chefrepo",
+    :private_group => "chefrepo",
+    :private_nodes => "fqdn:*"
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0.2801",
+        :interface => "enp3s0f0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {
-        :interface => "eth0.2800",
+        :interface => "enp3s0f0.2800",
         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"
@@ -28,10 +27,10 @@ default_attributes(
 
 run_list(
   "role[ucl]",
-  "role[hp-g5]",
-  "role[yournavigation]",
   "role[chef-server]",
   "role[chef-repository]",
-  "recipe[git::server]",
+  "role[letsencrypt]",
+  "role[git]",
+  "role[dns]",
   "recipe[serverinfo]"
 )