openstack/kolla-ansible
Code Issues Proposed changes

Fix py35/py36 and k-a-ubuntu-source gate jobs

Browse Source 
- 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
This commit is contained in:
Michal Nasiadka 2019-02-13 21:30:51 +01:00
parent c2f3ba3d5d
commit 189af13ba6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/mariadb/templates/galera.cnf.j2
View File

@ -8,6 +8,9 @@ default-character-set=utf8
default-character-set=utf8 default-character-set=utf8
[mysqld] [mysqld]
{% if kolla_base_distro in ['debian', 'ubuntu'] %}
basedir=/usr
{% endif %}
bind-address={{ api_interface_address }} bind-address={{ api_interface_address }}
port={{ mariadb_port }} port={{ mariadb_port }}

2
tox.ini
View File

@ -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 OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
PYTHON OS_TEST_PATH LISTOPT IDOPTION PYTHON OS_TEST_PATH LISTOPT IDOPTION
commands = 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 find . -type d -name "__pycache__" -delete
stestr run --slowest {posargs} stestr run --slowest {posargs}