Safely create directories

This prevents failure when the directory already exists.

This commit fixes a failure in centos-binary because of a change in the
RDO packaging, where the required directory is now created for us.

Change-Id: Idd3e15802c3e3fd363e1295111ec12948d566781
Closes-Bug: #1543417
This commit is contained in:
Martin André 2016-02-09 14:07:53 +09:00
parent 815f040ee8
commit e6571c0203
4 changed files with 8 additions and 4 deletions

View File

@ -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=$!

View File

@ -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

View File

@ -106,7 +106,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 \

View File

@ -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