Merge "toolbox: Move custom Ansible config to global location"

Author: Zuul

docker/kolla-toolbox/Dockerfile.j2

@@ -103,13 +103,15 @@ RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_package
 ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY
 
 COPY find_disks.py /usr/share/ansible/
-COPY ansible.cfg /var/lib/ansible/.ansible.cfg
+COPY ansible.cfg /etc/ansible/ansible.cfg
 RUN chmod 644 /usr/share/ansible/find_disks.py \
-              /var/lib/ansible/.ansible.cfg
+              /etc/ansible/ansible.cfg
 
 COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers
 RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
 {% block kolla_toolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 

docker/kolla-toolbox/extend_start.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ ! -f "/var/log/kolla/ansible.log" ]]; then
+    touch /var/log/kolla/ansible.log
+fi
+
+if [[ $(stat -c %U:%G /var/log/kolla/ansible.log) != "ansible:kolla" ]]; then
+    chown -R ansible:kolla /var/log/kolla/ansible.log
+fi
+
+if [[ $(stat -c %a /var/log/kolla/ansible.log) != "664" ]]; then
+    chmod 664 /var/log/kolla/ansible.log
+fi

releasenotes/notes/bug-1942846-1216faacacba94be.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes kolla-toolbox ansible.log logging for different users than ansible.
+    `LP#1942846 <https://launchpad.net/bugs/1942846>`__