From 189af13ba68918181aaebb82d0e6257122ff8332 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <michal.nasiadka@nokia.com>
Date: Wed, 13 Feb 2019 21:30:51 +0100
Subject: [PATCH] Fix py35/py36 and k-a-ubuntu-source gate jobs
- py35/py36 jobs are failing
python 3.6 pycache also includes links - so those also
need to be removed by tox testenv
- kolla-ansible-ubuntu-source job is failing
Without basedir set in galera.cnf - mysql_install_db looks for resolveip
in /usr/sbin, instead of /usr/bin, thus complains about cannot resolving
neither $HOSTNAME, nor localhost.
Change-Id: I40514c0a7c43ae01c7680aac81123942be1cdef9
---
ansible/roles/mariadb/templates/galera.cnf.j2 | 3 +++
tox.ini | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index 2d2f7b3b3..905a75f6e 100644
--- a/ansible/roles/mariadb/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -8,6 +8,9 @@ default-character-set=utf8
default-character-set=utf8
[mysqld]
+{% if kolla_base_distro in ['debian', 'ubuntu'] %}
+basedir=/usr
+{% endif %}
bind-address={{ api_interface_address }}
port={{ mariadb_port }}
diff --git a/tox.ini b/tox.ini
index bea00e0cf..472f5d5a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
PYTHON OS_TEST_PATH LISTOPT IDOPTION
commands =
- find . -type f -name "*.py[c|o]" -delete
+ find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
find . -type d -name "__pycache__" -delete
stestr run --slowest {posargs}
--
GitLab