From a7b37aac861c515aa073d02fe34f06e497ca4acb Mon Sep 17 00:00:00 2001 From: Telles Nobrega Date: Tue, 29 Oct 2019 14:25:26 -0300 Subject: [PATCH] Fixing image creation Updating image creation to keep compatibility with some package changes. Story: #2006752 Task: #37236 Change-Id: I23c8d14dce45d003fdfb58fed6591e937b27abab (cherry picked from commit 2cf6806c1829bf1ac0915f78ec319f07967f254b) --- .../plugins/mapr/resources/images/centos/configure_hue | 4 ++-- sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sahara_plugin_mapr/plugins/mapr/resources/images/centos/configure_hue b/sahara_plugin_mapr/plugins/mapr/resources/images/centos/configure_hue index ec21caa..496cbd3 100644 --- a/sahara_plugin_mapr/plugins/mapr/resources/images/centos/configure_hue +++ b/sahara_plugin_mapr/plugins/mapr/resources/images/centos/configure_hue @@ -6,5 +6,5 @@ MARIADB_VERSION=$(rpm -qa mariadb | cut -d- -f2) INSTALLED=$(rpm -qa | grep -i mariadb-compat-${MARIADB_VERSION}-) if [[ -z "$INSTALLED" ]]; then - rpm -ivh --nodeps http://yum.mariadb.org/$MARIADB_VERSION/rhel7-amd64/rpms/MariaDB-$MARIADB_VERSION-centos73-x86_64-compat.rpm -fi \ No newline at end of file + rpm -ivh --nodeps http://yum.mariadb.org/$MARIADB_VERSION/rhel7-amd64/rpms/MariaDB-compat-$MARIADB_VERSION-1.el7.centos.x86_64.rpm +fi diff --git a/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml b/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml index 3b754f8..f99d9db 100644 --- a/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml +++ b/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml @@ -109,7 +109,6 @@ validators: - redhat-lsb - redhat-lsb-core - redhat-lsb-printing - - urw-fonts - yum-utils - xml-common - ubuntu: