diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:18:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:18:07 +0000 |
| commit | 1340321eb5bcf6817fd13d44bdbf7ec39f9e956b (patch) | |
| tree | 56f3bc8dc9cd477fc9ddf553c79375c7495a0ae8 /docker/centos | |
| parent | f0105d89f743ec3b75621b3098060eec2393ddc0 (diff) | |
| parent | 115bc899665a6c63cdcb429df36ffa86af1eb22c (diff) | |
| download | kolla-1340321eb5bcf6817fd13d44bdbf7ec39f9e956b.tar.gz kolla-1340321eb5bcf6817fd13d44bdbf7ec39f9e956b.zip | |
Merge "Remove config-internal from Barbican"
Diffstat (limited to 'docker/centos')
| l--------- | docker/centos/binary/barbican/config-internal.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/barbican/Dockerfile | 2 | ||||
| l--------- | docker/centos/source/barbican/config-internal.sh | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/docker/centos/binary/barbican/config-internal.sh b/docker/centos/binary/barbican/config-internal.sh deleted file mode 120000 index 393328cd9..000000000 --- a/docker/centos/binary/barbican/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/source/barbican/Dockerfile b/docker/centos/source/barbican/Dockerfile index 92cbe3fea..0905c8e17 100644 --- a/docker/centos/source/barbican/Dockerfile +++ b/docker/centos/source/barbican/Dockerfile @@ -14,6 +14,6 @@ RUN cd /barbican \ && rm -rf /root/.cache COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/barbican/config-internal.sh b/docker/centos/source/barbican/config-internal.sh deleted file mode 120000 index 393328cd9..000000000 --- a/docker/centos/source/barbican/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/barbican/config-internal.sh
\ No newline at end of file |