FIPS gossip changes (#17507)

* separate fips gossip

* clean up

agent/consul/merge_oss.go

@@ -13,6 +13,10 @@ import (
 )
 
 func (md *lanMergeDelegate) enterpriseNotifyMergeMember(m *serf.Member) error {
+	if memberFIPS := m.Tags["fips"]; memberFIPS != "" {
+		return fmt.Errorf("Member '%s' is FIPS Consul; FIPS Consul is only available in Consul Enterprise",
+			m.Name)
+	}
 	if memberPartition := m.Tags["ap"]; memberPartition != "" {
 		return fmt.Errorf("Member '%s' part of partition '%s'; Partitions are a Consul Enterprise feature",
 			m.Name, memberPartition)

version/fips.go

@@ -2,6 +2,10 @@
 
 package version
 
+func IsFIPS() bool {
+	return false
+}
+
 func GetFIPSInfo() string {
 	return ""
 }