Make cinc the default

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index e20cf9db977539c40a806cb01186fbc980ae2deb..9fbd07043ece46bcb61f16982d1cf8ecaa631396 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -4,5 +4,5 @@ default[:chef][:server][:version] = "15.9.38"
 # Set the default client version
 default[:chef][:client][:version] = "18.8.54"
 
-# Default to using the chef client
-default[:chef][:client][:cinc] = false
+# Default to using the cinc client
+default[:chef][:client][:cinc] = true

diff --git a/roles/albi.rb b/roles/albi.rb
index 5b8086059999a8407cccbd2b599d14a0c4caae67..8608554e56ecfeaad718f354f561f55a9325aec7 100644 (file)
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -2,11 +2,6 @@ name "albi"
 description "Master role applied to albi"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :networking => {
     :interfaces => {
       :external => {

diff --git a/roles/meraxes.rb b/roles/meraxes.rb
index 68bf35ad673427411604c8addb9f8c06ee86ba35..3c75dba623ad851ad8c458dbb47800b6dba253c2 100644 (file)
--- a/roles/meraxes.rb
+++ b/roles/meraxes.rb
@@ -2,11 +2,6 @@ name "meraxes"
 description "Master role applied to meraxes"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :networking => {
     :interfaces => {
       :external => {

diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index 84d25a8ff256d0b30a1c49008ecc90731c4d7a35..a17a99c370751ac7c865930ca9de0edf39d0498a 100644 (file)
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -7,11 +7,6 @@ default_attributes(
       :yuri => { :status => :user }
     }
   },
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :networking => {
     :interfaces => {
       :internal => {

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 3b3670bd2a230f14f68548f9b9437305ab0cafc9..bad91beeb905e2e9d1c53c29bed90a31759dc2ee 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,11 +7,6 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :location => "Zagreb, Croatia",
   :networking => {
     :interfaces => {

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index c1e15b9364b96d92cb3f4612460a55cc1946dea9..e7c0e5850f171bebce1dadc49d154fa4e84f1970 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -19,11 +19,6 @@ default_attributes(
       :async_request_worker_factor => 4
     }
   },
-  :chef => {
-    :client => {
-      :cinc => true
-    }
-  },
   :memcached => {
     :memory_limit => 8192
   },