Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit eaace5d

Browse files
committed
Do Not Install the MySQL2 Gem in the OMSAgent Installation
1 parent 96c805f commit eaace5d

3 files changed

Lines changed: 0 additions & 27 deletions

File tree

build/buildRuby.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ if [ $RUNNING_FOR_TEST -eq 0 ]; then
241241

242242
# Pacify Make (Make doesn't know that the generated Ruby directory can vary)
243243
mkdir -p ${BASE_DIR}/intermediate/${BUILD_CONFIGURATION}/ruby
244-
else
245-
echo "Installing MySQL gem into Test Ruby under: ${RUBY_DESTDIR} ..."
246-
elevate ${RUBY_DESTDIR}/bin/gem install mysql2
247244
fi
248245

249246
exit 0

installer/bundle/bundle_skel.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -841,18 +841,6 @@ case "$installMode" in
841841
echo "----- No base kits to update -----"
842842
fi
843843

844-
# These steps are required to fix mysql2 gem compatibility issue on latest Ubuntu distros and can be removed after any release >2016_v1.2.0-75
845-
if ${OMS_RUBY_DIR}/gem list | grep -q "mysql2" ; then
846-
# Cleans up static mysql2 ruby gem if it exists in omsagent ruby path
847-
echo "Removing MySQL2 ruby gem."
848-
${OMS_RUBY_DIR}/gem uninstall mysql2 2>/dev/null
849-
fi
850-
echo "----- Installing MySQL2 ruby gem -----"
851-
if ! ${OMS_RUBY_DIR}/gem install mysql2; then
852-
echo "MySQL2 ruby gem was not installed. MySQL ruby fluentd plugin would be disabled."
853-
echo "Fix the dependencies and run '${OMS_RUBY_DIR}/ruby/bin/gem install mysql2' after omsagent installation to enable MySQL plugin."
854-
fi
855-
856844
if [ $KIT_STATUS -eq 0 ]; then
857845
# These conditionals exist due to some upgrade bugs in the postuninstall scripts of previous kits. These can be removed after GA.
858846
if [ -d /opt/microsoft/omsconfig ]; then

installer/datafiles/base_omsagent.data

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,6 @@ fi
182182
# The real conf directory has to be owned by omsagent to be readable by the omsagent daemon
183183
chown -R omsagent:omsagent ${{CONF_DIR}}
184184

185-
# Should run before onboarding script(Postinstall_300) and enabling OMS service(%Postinstall_500)
186-
%Postinstall_290
187-
if ${{OMSHOME}}/ruby/bin/gem list | grep -q "mysql2" ; then
188-
echo "Skipping MySQL2 ruby gem installation since it is already installed."
189-
else
190-
echo "----- Installing MySQL ruby gem -----"
191-
if ! ${{OMSHOME}}/ruby/bin/gem install mysql2; then
192-
echo "MySQL2 ruby gem was not installed. MySQL ruby plugin would be disabled."
193-
echo "Fix the dependencies and run '${OMS_RUBY_DIR}/ruby/bin/gem install mysql2' after omsagent installation to enable MySQL plugin."
194-
fi
195-
fi
196-
197185
%Postinstall_300
198186
if [ -f /etc/omsagent-onboard.conf ]; then
199187
/opt/microsoft/omsagent/bin/omsadmin.sh

0 commit comments

Comments
 (0)