Add flag to disable timezone-ii convergence

Due to L2G/timezone-ii#33, we need to be able to turn off that recipe.
rackspace-cookbooks · Jul 11, 2016 · 6c2784f · 6c2784f
1 parent 82a2f05
commit 6c2784f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/attributes/locale.rb b/attributes/locale.rb
@@ -19,3 +19,4 @@
 #
 
 default['platformstack']['locale'] = 'en_US.UTF-8'
+default['platformstack']['timezone-ii']['enabled'] = true
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -37,7 +37,7 @@
   block do
     run_context.include_recipe('platformstack::locale')
     run_context.include_recipe('ntp')
-    run_context.include_recipe('timezone-ii')
+    run_context.include_recipe('timezone-ii') if node['platformstack']['timezone-ii']['enabled'] == true
     run_context.include_recipe('auto-patch')
     unless Chef::Config[:solo] == true
       run_context.include_recipe('chef-client::delete_validation')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@
		#

		default['platformstack']['locale'] = 'en_US.UTF-8'
		default['platformstack']['timezone-ii']['enabled'] = true