From a1b0518b9a2d8c1e1ba188e10a55915eb49f6509 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 25 Sep 2015 20:08:40 +0000 Subject: [PATCH] Fix removal of config-external I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external --- docker/ceph/ceph-mon/Dockerfile.j2 | 1 - docker/ceph/ceph-osd/Dockerfile.j2 | 1 - docker/cinder/cinder-api/Dockerfile.j2 | 1 - docker/cinder/cinder-backup/Dockerfile.j2 | 1 - docker/cinder/cinder-scheduler/Dockerfile.j2 | 1 - docker/cinder/cinder-volume/Dockerfile.j2 | 1 - docker/glance/glance-api/Dockerfile.j2 | 1 - docker/glance/glance-registry/Dockerfile.j2 | 1 - docker/haproxy/Dockerfile.j2 | 2 +- docker/heat/heat-api-cfn/Dockerfile.j2 | 1 - docker/heat/heat-api/Dockerfile.j2 | 1 - docker/heat/heat-engine/Dockerfile.j2 | 1 - docker/horizon/Dockerfile.j2 | 1 - docker/keepalived/Dockerfile.j2 | 1 - docker/keystone/Dockerfile.j2 | 1 - docker/mariadb/Dockerfile.j2 | 8 +------- docker/memcached/Dockerfile.j2 | 1 - docker/murano/murano-api/Dockerfile.j2 | 1 - docker/murano/murano-engine/Dockerfile.j2 | 1 - docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-server/Dockerfile.j2 | 1 - docker/nova/nova-api/Dockerfile.j2 | 1 - docker/nova/nova-compute/Dockerfile.j2 | 1 - docker/nova/nova-conductor/Dockerfile.j2 | 1 - docker/nova/nova-consoleauth/Dockerfile.j2 | 1 - docker/nova/nova-libvirt/Dockerfile.j2 | 1 - docker/nova/nova-network/Dockerfile.j2 | 1 - docker/nova/nova-novncproxy/Dockerfile.j2 | 1 - docker/nova/nova-scheduler/Dockerfile.j2 | 1 - docker/openvswitch/ovs-db-server/Dockerfile.j2 | 1 - docker/openvswitch/ovs-vswitchd/Dockerfile.j2 | 2 +- docker/rabbitmq/Dockerfile.j2 | 2 +- docker/swift/swift-account-auditor/Dockerfile.j2 | 1 - docker/swift/swift-account-reaper/Dockerfile.j2 | 1 - docker/swift/swift-account-replicator/Dockerfile.j2 | 1 - docker/swift/swift-account-server/Dockerfile.j2 | 1 - docker/swift/swift-container-auditor/Dockerfile.j2 | 1 - docker/swift/swift-container-replicator/Dockerfile.j2 | 1 - docker/swift/swift-container-server/Dockerfile.j2 | 1 - docker/swift/swift-container-updater/Dockerfile.j2 | 1 - docker/swift/swift-object-auditor/Dockerfile.j2 | 1 - docker/swift/swift-object-expirer/Dockerfile.j2 | 1 - docker/swift/swift-object-replicator/Dockerfile.j2 | 1 - docker/swift/swift-object-server/Dockerfile.j2 | 1 - docker/swift/swift-object-updater/Dockerfile.j2 | 1 - docker/swift/swift-proxy-server/Dockerfile.j2 | 1 - docker/swift/swift-rsyncd/Dockerfile.j2 | 1 - 48 files changed, 4 insertions(+), 54 deletions(-) diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index e8a1337ac9..3f3d32a750 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceph-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ COPY fetch_ceph_keys.py /usr/bin/ CMD ["/start.sh"] diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index e9d47fc708..5e1eacc401 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -2,6 +2,5 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceph-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index a430fcf651..8e3185bf4e 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -11,7 +11,6 @@ RUN yum install -y python-keystone \ {% endif %} COPY ./start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index fa331b195f..7077d7250a 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index fa331b195f..7077d7250a 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 7dd8e4a0e5..4186289dcc 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum install -y lvm2 \ {% endif %} COPY ./start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index e603a6c363..2401a870a5 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index e603a6c363..2401a870a5 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index bda7d47ec3..a98738bfda 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN apt-get install -y --no-install-recommends haproxy \ {% endif %} COPY start.sh / -COPY config-external.sh ensure_latest_config.sh /opt/kolla/ +COPY ensure_latest_config.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index f6d811625d..54457708f8 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -16,7 +16,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 78981bb211..1f798e51de 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -16,7 +16,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index ee7b9e0281..a46fba490a 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -21,7 +21,6 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 01e0a5598d..f9c341de29 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -65,7 +65,6 @@ RUN ln -s horizon-source/* horizon \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 6821b41265..0397313479 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -19,7 +19,6 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} COPY start.sh check_alive.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 774262edaa..7d2aea70e0 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -65,7 +65,6 @@ RUN chown -R keystone: /var/www/cgi-bin/keystone \ && chmod 755 /var/www/cgi-bin/keystone/* COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 984c5d2681..c966dcb2d2 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -18,23 +18,17 @@ RUN yum install -y \ {% elif base_distro in ['ubuntu', 'debian'] %} -# At the end of this run statement we symlink two folders to match the folder -# structure of the RPM family for mysql configs. This allows us to not change -# the config-external.sh code -# TODO(SamYaple): Remove that symlink once config-external is updated RUN apt-get install -y --no-install-recommends \ mariadb-galera-server \ percona-xtrabackup \ socat \ expect \ && apt-get clean \ - && rm -rf /var/lib/mysql/* \ - && ln -s /etc/mysql/conf.d/ /etc/my.cnf.d + && rm -rf /var/lib/mysql/* {% endif %} COPY config-galera.sh /opt/kolla/config/ -COPY config-external.sh /opt/kolla/ COPY start.sh / CMD ["/start.sh"] diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 2be3f025e9..9d2b998782 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -14,7 +14,6 @@ RUN apt-get install -y --no-install-recommends memcached \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index f1d7e1f42a..6d69206e40 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -1,7 +1,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY config-external.sh /opt/kolla/ COPY start.sh / CMD ["/start.sh"] diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index f1d7e1f42a..6d69206e40 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -1,7 +1,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY config-external.sh /opt/kolla/ COPY start.sh / CMD ["/start.sh"] diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 0c116607cf..20f502f185 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -21,7 +21,6 @@ RUN yum install -y ebtables && yum clean all {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index baab4ee37f..6911afb94b 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -23,7 +23,6 @@ RUN yum install -y \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 69d5a7f728..1b3f496504 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -24,7 +24,6 @@ RUN yum install -y which \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index c704a528f0..82bec4fea2 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -11,7 +11,6 @@ RUN yum -y install openstack-nova-api \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index e10b05129f..f1b5b95b73 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -29,7 +29,6 @@ RUN apt-get install -y --no-install-recommends qemu-utils \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index d45cc95382..b3248c8f5e 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index f04236e246..cdc7c1fa77 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -11,7 +11,6 @@ RUN yum -y install openstack-nova-console \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index cbf0c2a640..a238625c54 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -25,7 +25,6 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 index be36a2d5fb..977f12a1d4 100644 --- a/docker/nova/nova-network/Dockerfile.j2 +++ b/docker/nova/nova-network/Dockerfile.j2 @@ -21,7 +21,6 @@ RUN yum -y install initscripts \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index cc31515c13..5f125ecf59 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -18,7 +18,6 @@ RUN cd /usr/share && ln -s nova-novncproxy-source/* novnc {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index f587d3b611..6d2584cf22 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -11,7 +11,6 @@ RUN yum -y install openstack-nova-scheduler \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2 index 05c6a928bf..bec5a8f12e 100644 --- a/docker/openvswitch/ovs-db-server/Dockerfile.j2 +++ b/docker/openvswitch/ovs-db-server/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 index 59079d3350..14b3d08a92 100644 --- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/ +COPY ovs_ensure_configured.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index cd8cb5dbb2..010c143c81 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN apt-get install -y --no-install-recommends rabbitmq-server \ RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management COPY start.sh / -COPY config-rabbit.sh config-external.sh /opt/kolla/ +COPY config-rabbit.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-account-auditor/Dockerfile.j2 b/docker/swift/swift-account-auditor/Dockerfile.j2 index 7320de9f41..5570b0d220 100644 --- a/docker/swift/swift-account-auditor/Dockerfile.j2 +++ b/docker/swift/swift-account-auditor/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-account-reaper/Dockerfile.j2 b/docker/swift/swift-account-reaper/Dockerfile.j2 index 7320de9f41..5570b0d220 100644 --- a/docker/swift/swift-account-reaper/Dockerfile.j2 +++ b/docker/swift/swift-account-reaper/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-account-replicator/Dockerfile.j2 b/docker/swift/swift-account-replicator/Dockerfile.j2 index 7320de9f41..5570b0d220 100644 --- a/docker/swift/swift-account-replicator/Dockerfile.j2 +++ b/docker/swift/swift-account-replicator/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2 index 54fe57fa95..7273c60a18 100644 --- a/docker/swift/swift-account-server/Dockerfile.j2 +++ b/docker/swift/swift-account-server/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-container-auditor/Dockerfile.j2 b/docker/swift/swift-container-auditor/Dockerfile.j2 index 1a08c0f5dc..ae798eebb0 100644 --- a/docker/swift/swift-container-auditor/Dockerfile.j2 +++ b/docker/swift/swift-container-auditor/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-container-replicator/Dockerfile.j2 b/docker/swift/swift-container-replicator/Dockerfile.j2 index 1a08c0f5dc..ae798eebb0 100644 --- a/docker/swift/swift-container-replicator/Dockerfile.j2 +++ b/docker/swift/swift-container-replicator/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2 index c68b983eba..2c7050876e 100644 --- a/docker/swift/swift-container-server/Dockerfile.j2 +++ b/docker/swift/swift-container-server/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-container-updater/Dockerfile.j2 b/docker/swift/swift-container-updater/Dockerfile.j2 index 1a08c0f5dc..ae798eebb0 100644 --- a/docker/swift/swift-container-updater/Dockerfile.j2 +++ b/docker/swift/swift-container-updater/Dockerfile.j2 @@ -12,7 +12,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-object-auditor/Dockerfile.j2 b/docker/swift/swift-object-auditor/Dockerfile.j2 index ab8a7adeeb..1bb481f7a6 100644 --- a/docker/swift/swift-object-auditor/Dockerfile.j2 +++ b/docker/swift/swift-object-auditor/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ t MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 1e8e0e826e..4224014507 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -13,7 +13,6 @@ RUN yum -y install \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-object-replicator/Dockerfile.j2 b/docker/swift/swift-object-replicator/Dockerfile.j2 index ab8a7adeeb..1bb481f7a6 100644 --- a/docker/swift/swift-object-replicator/Dockerfile.j2 +++ b/docker/swift/swift-object-replicator/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ t MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-object-server/Dockerfile.j2 b/docker/swift/swift-object-server/Dockerfile.j2 index ab8a7adeeb..1bb481f7a6 100644 --- a/docker/swift/swift-object-server/Dockerfile.j2 +++ b/docker/swift/swift-object-server/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ t MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-object-updater/Dockerfile.j2 b/docker/swift/swift-object-updater/Dockerfile.j2 index ab8a7adeeb..1bb481f7a6 100644 --- a/docker/swift/swift-object-updater/Dockerfile.j2 +++ b/docker/swift/swift-object-updater/Dockerfile.j2 @@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ t MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index bdd9836493..806cb95915 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -10,7 +10,6 @@ RUN yum -y install openstack-swift-proxy && yum clean all {% endif %} COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] {{ include_footer }} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index b2f60a94ef..5fda933a33 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -15,7 +15,6 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} COPY start.sh / -COPY config-external.sh /opt/kolla/ CMD ["/start.sh"]