diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-17 19:20:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-17 19:20:54 +0000 |
| commit | 8bf2017bb9b463e33698dc5f32b20a661c5917eb (patch) | |
| tree | 6e7908663e5c24edcfd3743836a1559b50efcb41 /docker | |
| parent | d87b4f63a2a4bd7017a94677e5310051689bb03d (diff) | |
| parent | 1a2fe93a95567937e0622d612f04953590e6ed41 (diff) | |
| download | kolla-8bf2017bb9b463e33698dc5f32b20a661c5917eb.tar.gz kolla-8bf2017bb9b463e33698dc5f32b20a661c5917eb.zip | |
Merge "Make Heka collect Ceph logs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ceph/ceph-base/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/ceph/ceph-mon/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 7 |
4 files changed, 25 insertions, 0 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 4787448f8..c71319dfd 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -23,6 +23,9 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + RUN useradd --user-group ceph \ && mkdir -p /home/ceph \ && chown -R ceph: /home/ceph diff --git a/docker/ceph/ceph-base/extend_start.sh b/docker/ceph/ceph-base/extend_start.sh new file mode 100644 index 000000000..968be0980 --- /dev/null +++ b/docker/ceph/ceph-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/ceph" ]]; then + mkdir -p /var/log/kolla/ceph +fi +if [[ $(stat -c %a /var/log/kolla/ceph) != "755" ]]; then + chmod 755 /var/log/kolla/ceph +fi diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index 8d43c0e3b..30ffba5fc 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -7,6 +7,13 @@ KEYRING_RGW="/etc/ceph/ceph.client.radosgw.keyring" MONMAP="/etc/ceph/ceph.monmap" MON_DIR="/var/lib/ceph/mon/ceph-${HOSTNAME}" +if [[ ! -d "/var/log/kolla/ceph" ]]; then + mkdir -p /var/log/kolla/ceph +fi +if [[ $(stat -c %a /var/log/kolla/ceph) != "755" ]]; then + chmod 755 /var/log/kolla/ceph +fi + # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh index 97119578a..733e45ff9 100644 --- a/docker/ceph/ceph-osd/extend_start.sh +++ b/docker/ceph/ceph-osd/extend_start.sh @@ -1,5 +1,12 @@ #!/bin/bash +if [[ ! -d "/var/log/kolla/ceph" ]]; then + mkdir -p /var/log/kolla/ceph +fi +if [[ $(stat -c %a /var/log/kolla/ceph) != "755" ]]; then + chmod 755 /var/log/kolla/ceph +fi + # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then |