(choria-io#476) Add configuration flag to always overwrite the cache

Support configuration where local file cache of certificates is always overwritten Fix fact discovery so that ginkgo works locally
vjanelle · Nov 15, 2018 · b8ce6f3 · b8ce6f3
1 parent d99b9a2
commit b8ce6f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -77,10 +77,11 @@ type ChoriaPluginConfig struct {
 	RubyLibdir      []string `confkey:"plugin.choria.agent_provider.mcorpc.libdir" type:"path_split"`
 
 	// security plugin
-	PrivilegedUsers   []string `confkey:"plugin.choria.security.privileged_users" type:"comma_split" default:"\\.privileged.mcollective$"`
-	CertnameWhitelist []string `confkey:"plugin.choria.security.certname_whitelist" type:"comma_split" default:"\\.mcollective$"`
-	Serializer        string   `confkey:"plugin.choria.security.serializer" validate:"enum=json,yaml"`
-	SecurityProvider  string   `confkey:"plugin.security.provider" default:"puppet" validate:"enum=puppet,file"`
+	PrivilegedUsers              []string `confkey:"plugin.choria.security.privileged_users" type:"comma_split" default:"\\.privileged.mcollective$"`
+	CertnameWhitelist            []string `confkey:"plugin.choria.security.certname_whitelist" type:"comma_split" default:"\\.mcollective$"`
+	Serializer                   string   `confkey:"plugin.choria.security.serializer" validate:"enum=json,yaml"`
+	SecurityProvider             string   `confkey:"plugin.security.provider" default:"puppet" validate:"enum=puppet,file"`
+	SecurityAlwaysOverwriteCache bool     `confkey:"plugin.security.provider.always_overwrite_cache" default:"false"`
 
 	// file security
 	FileSecurityCertificate string `confkey:"plugin.security.file.certificate"`

diff --git a/server/discovery/facts/facts.go b/server/discovery/facts/facts.go
@@ -28,7 +28,7 @@ func Match(filters [][3]string, fw *choria.Framework, log *logrus.Entry) bool {
 		}
 
 		if matched == false {
-			log.Debug("Failed to match fact filter '%#v'", filter)
+			log.Debugf("Failed to match fact filter '%#v'", filter)
 			break
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		if matched == false {
-    			log.Debug("Failed to match fact filter '%#v'", filter)
+    			log.Debugf("Failed to match fact filter '%#v'", filter)
     			break
     		}
     	}
@@ Expand Down @@