diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-10 19:48:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-10 19:48:49 +0000 |
| commit | f98ad9462b7bd70ba79e448f97c7d3b21cf5e14b (patch) | |
| tree | b96fb3cd374f2a15ec169f191090163b36754628 | |
| parent | b4b206de42abcb53b8536b208e3370967eb9da0d (diff) | |
| parent | 88f1e32aa997b2b8c3627cd4b2128402262fdef4 (diff) | |
| download | kolla-f98ad9462b7bd70ba79e448f97c7d3b21cf5e14b.tar.gz kolla-f98ad9462b7bd70ba79e448f97c7d3b21cf5e14b.zip | |
Merge "toolbox: Move custom Ansible config to global location"
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/kolla-toolbox/extend_start.sh | 13 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1942846-1216faacacba94be.yaml | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index fcee30cb3..9261f5c0a 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/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 %} diff --git a/docker/kolla-toolbox/extend_start.sh b/docker/kolla-toolbox/extend_start.sh new file mode 100644 index 000000000..198587145 --- /dev/null +++ b/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 diff --git a/releasenotes/notes/bug-1942846-1216faacacba94be.yaml b/releasenotes/notes/bug-1942846-1216faacacba94be.yaml new file mode 100644 index 000000000..588af50d5 --- /dev/null +++ b/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>`__ |