diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:19:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:19:19 +0000 |
| commit | 3d10fff6893ea8eed89f07baf0ed98d31cd637d6 (patch) | |
| tree | 369adfedc4f9b6a6ed6d14bb57a5df634e3550f2 /docker/centos | |
| parent | 8e5d76e60a1c6e59d13f0510a454977cb807efaf (diff) | |
| parent | 3c7e93b737bc58253d776fda5d3e7001826cce68 (diff) | |
| download | kolla-3d10fff6893ea8eed89f07baf0ed98d31cd637d6.tar.gz kolla-3d10fff6893ea8eed89f07baf0ed98d31cd637d6.zip | |
Merge "Remove config-internal for keepalived"
Diffstat (limited to 'docker/centos')
| -rw-r--r--[-rwxr-xr-x] | docker/centos/binary/keepalived/Dockerfile | 3 | ||||
| l--------- | docker/centos/binary/keepalived/config-internal.sh | 1 | ||||
| l--------- | docker/centos/binary/keepalived/keepalived.conf | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/docker/centos/binary/keepalived/Dockerfile b/docker/centos/binary/keepalived/Dockerfile index 6aa0a4f10..3e2e4fa46 100755..100644 --- a/docker/centos/binary/keepalived/Dockerfile +++ b/docker/centos/binary/keepalived/Dockerfile @@ -7,8 +7,7 @@ RUN yum -y install \ socat \ && yum clean all -COPY keepalived.conf /etc/keepalived/ COPY start.sh check_alive.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/keepalived/config-internal.sh b/docker/centos/binary/keepalived/config-internal.sh deleted file mode 120000 index 9e9437a00..000000000 --- a/docker/centos/binary/keepalived/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keepalived/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/binary/keepalived/keepalived.conf b/docker/centos/binary/keepalived/keepalived.conf deleted file mode 120000 index d9794c9e5..000000000 --- a/docker/centos/binary/keepalived/keepalived.conf +++ /dev/null @@ -1 +0,0 @@ -../../../common/keepalived/keepalived.conf
\ No newline at end of file |