diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-25 20:08:40 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-25 20:08:40 +0000 |
| commit | a1b0518b9a2d8c1e1ba188e10a55915eb49f6509 (patch) | |
| tree | ad25628eb5ccc7f0c1e915da13db1ee9fc984648 /docker/nova | |
| parent | e4cc27ff4278a62981da435ad7d7dcee6158b1f2 (diff) | |
| download | kolla-a1b0518b9a2d8c1e1ba188e10a55915eb49f6509.tar.gz kolla-a1b0518b9a2d8c1e1ba188e10a55915eb49f6509.zip | |
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
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-conductor/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-consoleauth/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-network/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-scheduler/Dockerfile.j2 | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index c704a528f..82bec4fea 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 e10b05129..f1b5b95b7 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 d45cc9538..b3248c8f5 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 f04236e24..cdc7c1fa7 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 cbf0c2a64..a238625c5 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 be36a2d5f..977f12a1d 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 cc31515c1..5f125ecf5 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 f587d3b61..6d2584cf2 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"] |