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

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

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"]

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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/* \
+    && rm -rf /var/lib/mysql/*
-    && ln -s /etc/mysql/conf.d/ /etc/my.cnf.d
 
 {% endif %}
 
 COPY config-galera.sh /opt/kolla/config/
-COPY config-external.sh /opt/kolla/
 COPY start.sh /
 
 CMD ["/start.sh"]

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"]
 

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"]

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"]

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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"]
 

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

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"]