diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-27 17:06:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-27 17:06:35 +0000 |
| commit | 8f5747318b44970d9e6fac1e28ea595b9c8e4049 (patch) | |
| tree | 77c6d752357db110ea723289a7b1307570247fff /docker | |
| parent | b4ecfc5043ae845bafe4f871935598d2244e439d (diff) | |
| parent | 54919dc4984121fcbc1de8f4f7ace00c37981a35 (diff) | |
| download | kolla-8f5747318b44970d9e6fac1e28ea595b9c8e4049.tar.gz kolla-8f5747318b44970d9e6fac1e28ea595b9c8e4049.zip | |
Merge "Enable openvswitch container logs in host volumes"
Diffstat (limited to 'docker')
4 files changed, 19 insertions, 4 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 558339baf..1dd566438 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -14,3 +14,8 @@ RUN apt-get -y install --no-install-recommends \ && apt-get clean {% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_openvswitch_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start diff --git a/docker/openvswitch/openvswitch-base/extend_start.sh b/docker/openvswitch/openvswitch-base/extend_start.sh new file mode 100644 index 000000000..67fc38537 --- /dev/null +++ b/docker/openvswitch/openvswitch-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/openvswitch" ]]; then + mkdir -p /var/log/kolla/openvswitch +fi +if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then + chmod 755 /var/log/kolla/openvswitch +fi + +source /usr/local/bin/kolla_openvswitch_extend_start diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index 1bcc6e71e..b588a094d 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER {{ maintainer }} COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured /usr/local/bin/kolla_extend_start +COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start +RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured /usr/local/bin/kolla_openvswitch_extend_start {{ include_footer }} diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 8692f8cee..632e54a23 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-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_openvswitch_extend_start +RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start {{ include_footer }} |