diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-10 18:41:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-10 18:41:15 +0000 |
| commit | 6267192c4bd0f3dbc2b5a7d3dcbf7c0d71bda698 (patch) | |
| tree | efe7c39f1d0895578f5aaf718b0b5d6cc319409e | |
| parent | b479d8db0357d9c72aa95fc0bdbd7c873878bb4d (diff) | |
| parent | e6571c02039ec628a6511ec932fc371711ef20dd (diff) | |
| download | kolla-6267192c4bd0f3dbc2b5a7d3dcbf7c0d71bda698.tar.gz kolla-6267192c4bd0f3dbc2b5a7d3dcbf7c0d71bda698.zip | |
Merge "Safely create directories"
| -rw-r--r-- | docker/dind/start.sh | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/extend_start.sh | 6 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/docker/dind/start.sh b/docker/dind/start.sh index 56e733409..8d861f744 100644 --- a/docker/dind/start.sh +++ b/docker/dind/start.sh @@ -11,7 +11,7 @@ done docker daemon -s btrfs 2>&1 > docker.log & docker_pid=$! -mkdir /var/run/sshd +mkdir -p /var/run/sshd /usr/sbin/sshd -D 2>&1 > sshd.log & sshd_pid=$! diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh index 084e76a19..efe531ff9 100644 --- a/docker/nova/nova-compute/extend_start.sh +++ b/docker/nova/nova-compute/extend_start.sh @@ -4,6 +4,10 @@ # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then sudo chown nova: /var/lib/nova/ - mkdir /var/lib/nova/instances + mkdir -p /var/lib/nova/instances + # Only update permissions if permissions need to be updated + if [[ $(stat -c %U:%G /var/lib/nova/instances) != "nova:nova" ]]; then + sudo chown nova: /var/lib/nova/instances + fi exit 0 fi diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 5e9848929..c9deeb64a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -102,7 +102,7 @@ RUN apt-get install -y --no-install-recommends \ ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ - && mkdir /var/lib/kolla \ + && mkdir -p /var/lib/kolla \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 880050cfb..4bcf51014 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -34,4 +34,4 @@ RUN ln -s swift-base-source/* swift \ {% endif %} COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring -RUN mkdir /opt/swift +RUN mkdir -p /opt/swift |