openstack/kolla-ansible
Code Issues Proposed changes

Remove /opt/kolla directory creation base images

Browse Source 
No need to do a make dir since COPY will create it.
Also removed from service specific base images since
it will not be required.

Change-Id: I15064eaf6e8faa9acbda68eaf3d85589ea9ed3d9
Closes-Bug: #1479176
This commit is contained in:
Swapnil Kulkarni 2015-07-29 03:23:51 +00:00
parent 9f3b2ddf17
commit a0f67f67df
9 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/centos/binary/base/Dockerfile
View File

@ -122,5 +122,4 @@ RUN rpm -e --nodeps pam
RUN yum -y install pam+noaudit && yum clean all RUN yum -y install pam+noaudit && yum clean all
# End dirty like zebra # End dirty like zebra
RUN mkdir -p /opt/kolla
COPY service_hosts.sh kolla-common.sh /opt/kolla/ COPY service_hosts.sh kolla-common.sh /opt/kolla/

3
docker/centos/binary/ceilometer/ceilometer-base/Dockerfile
View File

@ -1,5 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla COPY config-ceilometer.sh /opt/kolla/
COPY config-ceilometer.sh /opt/kolla/config-ceilometer.sh

3
docker/centos/binary/glance/glance-base/Dockerfile
View File

@ -3,5 +3,4 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-glance python-oslo-i18n && yum clean all RUN yum -y install openstack-glance python-oslo-i18n && yum clean all
RUN mkdir -p /opt/kolla COPY config-glance.sh /opt/kolla/
COPY config-glance.sh /opt/kolla/config-glance.sh

3
docker/centos/binary/heat/heat-base/Dockerfile
View File

@ -1,5 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla COPY config-heat.sh /opt/kolla/
COPY config-heat.sh /opt/kolla/config-heat.sh

3
docker/centos/binary/magnum/magnum-base/Dockerfile
View File

@ -5,5 +5,4 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo
RUN mkdir -p /opt/kolla COPY config-magnum.sh /opt/kolla/
COPY config-magnum.sh /opt/kolla/config-magnum.sh

1
docker/centos/source/base/Dockerfile
View File

@ -35,5 +35,4 @@ RUN pip install --upgrade \
pip \ pip \
tox tox
RUN mkdir -p /opt/kolla
COPY service_hosts.sh kolla-common.sh /opt/kolla/ COPY service_hosts.sh kolla-common.sh /opt/kolla/

3
docker/centos/source/magnum/magnum-base/Dockerfile
View File

@ -12,5 +12,4 @@ RUN cd /magnum \
&& cp -r /magnum/etc/* /etc/magnum/ \ && cp -r /magnum/etc/* /etc/magnum/ \
&& rm -rf /root/.cache && rm -rf /root/.cache
RUN mkdir -p /opt/kolla COPY config-magnum.sh /opt/kolla/
COPY config-magnum.sh /opt/kolla/config-magnum.sh

4
docker/fedora/binary/base/Dockerfile
View File

@ -104,6 +104,4 @@ RUN rpm -e --nodeps pam
RUN yum -y install pam+noaudit && yum clean all RUN yum -y install pam+noaudit && yum clean all
# End dirty like zebra # End dirty like zebra
RUN mkdir -p /opt/kolla COPY service_hosts.sh kolla-common.sh /opt/kolla/
ADD service_hosts.sh /opt/kolla/service_hosts.sh
ADD kolla-common.sh /opt/kolla/kolla-common.sh

1
docker/ubuntu/source/base/Dockerfile
View File

@ -36,5 +36,4 @@ RUN pip install --upgrade \
pip \ pip \
tox tox
RUN mkdir /opt/kolla
COPY service_hosts.sh kolla-common.sh /opt/kolla/ COPY service_hosts.sh kolla-common.sh /opt/kolla/