diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:17:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:17:25 +0000 |
| commit | 6a4c2b1ad0aa9f1a90b5eebbd172a6480c500a81 (patch) | |
| tree | 93ce77d5a93088c48388e695b293e44c78f31f4a /docker/centos/binary | |
| parent | e0e173b1f2047dae65b7665700ef4460e33046a8 (diff) | |
| parent | 3cfd5265aedc9f822ae57c4b522744e518eccbe0 (diff) | |
| download | kolla-6a4c2b1ad0aa9f1a90b5eebbd172a6480c500a81.tar.gz kolla-6a4c2b1ad0aa9f1a90b5eebbd172a6480c500a81.zip | |
Merge "Remove config-internal for openvswitch"
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 |