Revert "SERVER-32051 Require shard servers and config servers to be replica sets"r3.6.0-rc6

This reverts commit e35e66b50e4a0b362004730c8481025917c4e152.

Part of SERVER-32080 as well.

1 files changed, 5 insertions, 14 deletions

diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 5ae097fb416..4360c0e155b 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -453,17 +453,16 @@ Status addMongodOptions(moe::OptionSection* options) {
                            "configsvr",
                            moe::Switch,
                            "declare this is a config db of a cluster; default port 27019; "
-                           "default dir /data/configdb; requires using --replSet")
+                           "default dir /data/configdb")
         .setSources(moe::SourceAllLegacy)
         .incompatibleWith("shardsvr")
         .incompatibleWith("nojournal");
 
     sharding_options
-        .addOptionChaining(
-            "shardsvr",
-            "shardsvr",
-            moe::Switch,
-            "declare this is a shard db of a cluster; default port 27018; requires using --replSet")
+        .addOptionChaining("shardsvr",
+                           "shardsvr",
+                           moe::Switch,
+                           "declare this is a shard db of a cluster; default port 27018")
         .setSources(moe::SourceAllLegacy)
         .incompatibleWith("configsvr")
         .incompatibleWith("master")
@@ -1199,14 +1198,6 @@ Status storeMongodOptions(const moe::Environment& params) {
     }
     if (params.count("sharding.clusterRole")) {
         auto clusterRoleParam = params["sharding.clusterRole"].as<std::string>();
-
-        if (!params.count("replication.replSet") && !Command::testCommandsEnabled) {
-            return {ErrorCodes::InvalidOptions,
-                    str::stream() << "Cannot start a " << clusterRoleParam
-                                  << " as a standalone server. Please start this node as a replica "
-                                     "set using --replSet."};
-        }
-
         if (clusterRoleParam == "configsvr") {
             serverGlobalParams.clusterRole = ClusterRole::ConfigServer;