From 09c379422d44ec10320abee5ef33cdf90fd9064e Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Thu, 11 Oct 2018 18:02:04 -0500
Subject: [PATCH] MCOL-1244 - default install to non-distributed

---
 oamapps/mcsadmin/mcsadmin.cpp | 3 ++-
 procmgr/main.cpp              | 2 +-
 procmgr/processmanager.cpp    | 2 +-
 procmon/processmonitor.cpp    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 95b759812..4e0b837ff 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -5634,7 +5634,7 @@ int processCommand(string* arguments)
             int DataRedundancyNetworkType;
             int DataRedundancyStorageType;
             string AmazonVPCNextPrivateIP;
-            string DistributedInstall = "y";
+            string DistributedInstall = "n";
 
             try
             {
@@ -5644,6 +5644,7 @@ int processCommand(string* arguments)
                 oam.getSystemConfig("DataRedundancyCopies", DataRedundancyCopies);
                 oam.getSystemConfig("DataRedundancyNetworkType", DataRedundancyNetworkType);
                 oam.getSystemConfig("DataRedundancyStorageType", DataRedundancyStorageType);
+                oam.getSystemConfig("DistributedInstall", DistributedInstall);
             }
             catch (...) {}
 
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 2ca22a936..63205f528 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -747,7 +747,7 @@ static void startMgrProcessThread()
     }
 
     //get Distributed Install
-    string DistributedInstall = "y";
+    string DistributedInstall = "n";
 
     try
     {
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index 2594ff5a0..b3aa195b9 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -4842,7 +4842,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
     pthread_mutex_lock(&THREAD_LOCK);
 
     //get Distributed Install
-    string DistributedInstall = "y";
+    string DistributedInstall = "n";
 
     try
     {
diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index e02f821bd..701c6da2e 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -1006,7 +1006,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
                     log.writeLog(__LINE__, "STOPALL: ACK back to ProcMgr, return status = " + oam.itoa((int) requestStatus));
 
                     //Remove MariaDB ColumnStore PGK on REMOVE option if distubuted install
-                    string DistributedInstall = "y";
+                    string DistributedInstall = "n";
 
                     try
                     {