diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-07 17:52:20 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-07 17:52:20 +0000 |
| commit | 3cfd5265aedc9f822ae57c4b522744e518eccbe0 (patch) | |
| tree | f9e6f2a4d0172498b6744861a8ed1c009d9d3c6d /docker/centos/binary | |
| parent | a5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff) | |
| download | kolla-3cfd5265aedc9f822ae57c4b522744e518eccbe0.tar.gz kolla-3cfd5265aedc9f822ae57c4b522744e518eccbe0.zip | |
Remove config-internal for openvswitch
Change-Id: I4b8f275b670a1ac3b72b2af34b53bddca4a63cb2
Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/centos/binary')
4 files changed, 4 insertions, 8 deletions
diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile index c34d72302..8dcc5dc67 100644 --- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh deleted file mode 120000 index 86927f3dd..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-db-server/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile index 60989c846..bb7ec8c67 100644 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY ovs_ensure_configured.sh config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh deleted file mode 120000 index dec53e36d..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/config-internal.sh
\ No newline at end of file |