From 10b0199e81eb8e445abd240f1a6b45e32f02df6e Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Thu, 8 Dec 2016 13:15:55 -0600
Subject: [PATCH] MCOL-452

---
 oam/install_scripts/performance_installer.sh |  4 ++--
 oam/install_scripts/user_installer.sh        |  4 ++--
 oamapps/mcsadmin/mcsadmin.cpp                | 13 -------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/oam/install_scripts/performance_installer.sh b/oam/install_scripts/performance_installer.sh
index c55a3f60d..609ab003c 100644
--- a/oam/install_scripts/performance_installer.sh
+++ b/oam/install_scripts/performance_installer.sh
@@ -144,7 +144,7 @@ expect {
         -re {[$#] } { }
 }
 
-send "scp $HOME/mariadb-columnstore*$VERSION*rpm $USERNAME@$SERVER:.;$PKGERASE dummy\n"
+send "scp $HOME/mariadb-columnstore*$VERSION*$PKGTYPE $USERNAME@$SERVER:.;$PKGERASE1 dummy\n"
 if { $PASSWORD != "ssh" } {
         set timeout 30
         expect {
@@ -172,7 +172,7 @@ if { $INSTALLTYPE == "initial"} {
 	#
 	send_user "Install MariaDB Columnstore Packages on Module               "
 
-	send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE dummy'\n"
+	send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE1 dummy'\n"
 	if { $PASSWORD != "ssh" } {
 		set timeout 30
 		expect {
diff --git a/oam/install_scripts/user_installer.sh b/oam/install_scripts/user_installer.sh
index 55cd98e9a..c4c75beb9 100644
--- a/oam/install_scripts/user_installer.sh
+++ b/oam/install_scripts/user_installer.sh
@@ -146,7 +146,7 @@ expect {
 	-re {[$#] } { }
 }
 
-send "scp $HOME/mariadb-columnstore*$VERSION*rpm $USERNAME@$SERVER:.;$PKGERASE dummy\n"
+send "scp $HOME/mariadb-columnstore*$VERSION*$PKGTYPE $USERNAME@$SERVER:.;$PKGERASE1 dummy\n"
 if { $PASSWORD != "ssh" } {
 	set timeout 30
 	expect {
@@ -174,7 +174,7 @@ if { $INSTALLTYPE == "initial"} {
 	# install package
 	#
 	send_user "Install MariaDB ColumnStore Packages on Module               "
-	send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE dummy'\n"
+	send "ssh $USERNAME@$SERVER '$PKGINSTALL ;$PKGERASE1 dummy'\n"
 	if { $PASSWORD != "ssh" } {
 		set timeout 30
 		expect {
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 25d343102..9133e5d41 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -1889,13 +1889,6 @@ int processCommand(string* arguments)
 
         case 14: // addDbroot parameters: dbroot-number
         {
-            parentOAMModule = getParentOAMModule();
-            if ( localModule != parentOAMModule ) {
-                //exit out since not on Parent OAM Module
-                cout << endl << "**** addDbroot Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-            
 		string GlusterConfig = "n";
 		try {
 			oam.getSystemConfig( "GlusterConfig", GlusterConfig);
@@ -1985,12 +1978,6 @@ int processCommand(string* arguments)
 
         case 15: // removeDbroot parameters: dbroot-list
         {
-		parentOAMModule = getParentOAMModule();
-            if ( localModule != parentOAMModule ) {
-                //exit out since not on Parent OAM Module
-                cout << endl << "**** removeDbroot Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
 
 		string GlusterConfig = "n";
 		try {