From 9becd325cddd70957e34d340a15cc6c1529fd14f Mon Sep 17 00:00:00 2001 From: Martin André Date: Tue, 14 Jul 2015 16:37:45 +0900 Subject: Fix symlinks to config-{internal,external}.sh Many of these were actually files containing the path to the real script, instead of being symlinks. config-{internal,external}.sh files in openvswitch/ovs-base were not needed and were thus deleted. Also update minimal-environment-vars.md after symlinks were fixed. Change-Id: I11c3e735067b1feb83c3184c32333e598fbdf590 Closes-Bug: #1474227 --- docker/centos/binary/magnum/magnum-api/config-external.sh | 2 +- docker/centos/binary/magnum/magnum-api/config-internal.sh | 2 +- docker/centos/binary/magnum/magnum-conductor/config-external.sh | 2 +- docker/centos/binary/magnum/magnum-conductor/config-internal.sh | 2 +- docker/centos/binary/openvswitch/ovs-base/Dockerfile | 2 -- docker/centos/binary/openvswitch/ovs-base/config-external.sh | 1 - docker/centos/binary/openvswitch/ovs-base/config-internal.sh | 1 - docker/centos/binary/zaqar/config-external.sh | 2 +- docker/centos/binary/zaqar/config-internal.sh | 2 +- 9 files changed, 6 insertions(+), 10 deletions(-) mode change 100644 => 120000 docker/centos/binary/magnum/magnum-api/config-external.sh mode change 100644 => 120000 docker/centos/binary/magnum/magnum-api/config-internal.sh mode change 100644 => 120000 docker/centos/binary/magnum/magnum-conductor/config-external.sh mode change 100644 => 120000 docker/centos/binary/magnum/magnum-conductor/config-internal.sh delete mode 100644 docker/centos/binary/openvswitch/ovs-base/config-external.sh delete mode 100644 docker/centos/binary/openvswitch/ovs-base/config-internal.sh mode change 100644 => 120000 docker/centos/binary/zaqar/config-external.sh mode change 100644 => 120000 docker/centos/binary/zaqar/config-internal.sh (limited to 'docker/centos') diff --git a/docker/centos/binary/magnum/magnum-api/config-external.sh b/docker/centos/binary/magnum/magnum-api/config-external.sh deleted file mode 100644 index 51d63c9ec..000000000 --- a/docker/centos/binary/magnum/magnum-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/config-external.sh diff --git a/docker/centos/binary/magnum/magnum-api/config-external.sh b/docker/centos/binary/magnum/magnum-api/config-external.sh new file mode 120000 index 000000000..746e2aa58 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-api/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-api/config-internal.sh b/docker/centos/binary/magnum/magnum-api/config-internal.sh deleted file mode 100644 index 3637ccaff..000000000 --- a/docker/centos/binary/magnum/magnum-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/config-internal.sh diff --git a/docker/centos/binary/magnum/magnum-api/config-internal.sh b/docker/centos/binary/magnum/magnum-api/config-internal.sh new file mode 120000 index 000000000..7f9cace39 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-api/config-internal.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-conductor/config-external.sh b/docker/centos/binary/magnum/magnum-conductor/config-external.sh deleted file mode 100644 index a9ca55e4e..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/config-external.sh diff --git a/docker/centos/binary/magnum/magnum-conductor/config-external.sh b/docker/centos/binary/magnum/magnum-conductor/config-external.sh new file mode 120000 index 000000000..2d3f514d5 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-conductor/config-external.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-conductor/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh deleted file mode 100644 index b2302e7ae..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/config-internal.sh diff --git a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh new file mode 120000 index 000000000..1d8f73aa9 --- /dev/null +++ b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh @@ -0,0 +1 @@ +../../../../common/magnum/magnum-conductor/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile index 98506b477..7d4ade54c 100644 --- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-base/Dockerfile @@ -3,5 +3,3 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openvswitch \ && yum clean all - -COPY config-internal.sh config-external.sh /opt/kolla/ diff --git a/docker/centos/binary/openvswitch/ovs-base/config-external.sh b/docker/centos/binary/openvswitch/ovs-base/config-external.sh deleted file mode 100644 index fc177a286..000000000 --- a/docker/centos/binary/openvswitch/ovs-base/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-base/config-external.sh diff --git a/docker/centos/binary/openvswitch/ovs-base/config-internal.sh b/docker/centos/binary/openvswitch/ovs-base/config-internal.sh deleted file mode 100644 index fc177a286..000000000 --- a/docker/centos/binary/openvswitch/ovs-base/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-base/config-external.sh diff --git a/docker/centos/binary/zaqar/config-external.sh b/docker/centos/binary/zaqar/config-external.sh deleted file mode 100644 index 3459a6f72..000000000 --- a/docker/centos/binary/zaqar/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/zaqar/config-external.sh diff --git a/docker/centos/binary/zaqar/config-external.sh b/docker/centos/binary/zaqar/config-external.sh new file mode 120000 index 000000000..38fff40d1 --- /dev/null +++ b/docker/centos/binary/zaqar/config-external.sh @@ -0,0 +1 @@ +../../../common/zaqar/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/zaqar/config-internal.sh b/docker/centos/binary/zaqar/config-internal.sh deleted file mode 100644 index 10b7affb7..000000000 --- a/docker/centos/binary/zaqar/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/zaqar/config-internal.sh diff --git a/docker/centos/binary/zaqar/config-internal.sh b/docker/centos/binary/zaqar/config-internal.sh new file mode 120000 index 000000000..9946142b4 --- /dev/null +++ b/docker/centos/binary/zaqar/config-internal.sh @@ -0,0 +1 @@ +../../../common/zaqar/config-internal.sh \ No newline at end of file -- cgit v1.2.3