diff options
| -rw-r--r-- | ansible/roles/common/templates/heka-openstack.toml.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/manila/templates/manila.conf.j2 | 1 | ||||
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/manila/manila-base/extend_start.sh | 10 |
5 files changed, 20 insertions, 6 deletions
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index 3649705b6..32c20514a 100644 --- a/ansible/roles/common/templates/heka-openstack.toml.j2 +++ b/ansible/roles/common/templates/heka-openstack.toml.j2 @@ -6,5 +6,5 @@ filename = "lua_decoders/os_openstack_log.lua" type = "LogstreamerInput" decoder = "openstack_log_decoder" log_directory = "/var/log/kolla" -file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral)/(?P<Program>.*)\.log' +file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral|manila)/(?P<Program>.*)\.log' differentiator = ["Service", "_", "Program"] diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2 index 16355c760..907578e41 100644 --- a/ansible/roles/manila/templates/manila.conf.j2 +++ b/ansible/roles/manila/templates/manila.conf.j2 @@ -2,7 +2,6 @@ debug = {{ manila_logging_debug }} log_dir = /var/log/kolla/manila -use_forwarded_for = true my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index ac2fe479d..3590103a9 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -1,8 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }} MAINTAINER {{ maintainer }} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start +RUN chmod 755 /usr/local/bin/kolla_manila_extend_start {{ include_footer }} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index b4ea531b9..ef6c2e833 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -14,9 +14,9 @@ ADD manila-base-archive /manila-base-source RUN ln -s manila-base-source/* manila \ && useradd --user-group manila \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /manila \ - && mkdir -p /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/manila \ + && mkdir -p /etc/manila /var/lib/manila /var/cache/manila /home/manila \ && cp -r /manila/etc/manila/* /etc/manila/ \ - && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/manila \ + && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /home/manila \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/manila/rootwrap.conf COPY manila_sudoers /etc/sudoers.d/manila_sudoers @@ -25,4 +25,9 @@ RUN chmod 750 /etc/sudoers.d \ {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_manila_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start + RUN usermod -a -G kolla manila diff --git a/docker/manila/manila-base/extend_start.sh b/docker/manila/manila-base/extend_start.sh new file mode 100644 index 000000000..84bcd2ebe --- /dev/null +++ b/docker/manila/manila-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/manila" ]]; then + mkdir -p /var/log/kolla/manila +fi +if [[ $(stat -c %a /var/log/kolla/manila) != "755" ]]; then + chmod 755 /var/log/kolla/manila +fi + +source /usr/local/bin/kolla_manila_extend_start |