Merge pull request #2735 from hashicorp/f-no_host_uuid-true

Default no_host_uuid to true instead of false

command/agent/config-test-fixtures/basic.hcl

@@ -59,7 +59,7 @@ client {
     gc_disk_usage_threshold = 82
     gc_inode_usage_threshold = 91
     gc_max_allocs = 50
-    no_host_uuid = true
+    no_host_uuid = false
 }
 server {
 	enabled = true

command/agent/config.go

@@ -543,6 +543,7 @@ func DefaultConfig() *Config {
 			GCDiskUsageThreshold:  80,
 			GCInodeUsageThreshold: 70,
 			GCMaxAllocs:           50,
+			NoHostUUID:            true,
 		},
 		Server: &ServerConfig{
 			Enabled:          false,
@@ -1003,7 +1004,8 @@ func (a *ClientConfig) Merge(b *ClientConfig) *ClientConfig {
 	if b.GCMaxAllocs != 0 {
 		result.GCMaxAllocs = b.GCMaxAllocs
 	}
-	if b.NoHostUUID {
+	// NoHostUUID defaults to true, merge if false
+	if !b.NoHostUUID {
 		result.NoHostUUID = b.NoHostUUID
 	}
 

command/agent/config_parse_test.go

@@ -78,7 +78,7 @@ func TestConfig_Parse(t *testing.T) {
 					GCDiskUsageThreshold:  82,
 					GCInodeUsageThreshold: 91,
 					GCMaxAllocs:           50,
-					NoHostUUID:            true,
+					NoHostUUID:            false,
 				},
 				Server: &ServerConfig{
 					Enabled:           true,