diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-30 11:23:39 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-06 03:30:26 +0000 |
| commit | cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (patch) | |
| tree | da1028203186b45f869828dc5b4d17c13fadea94 /docker/keepalived | |
| parent | 3a56ce182662bcc9cf753024275034907ea36032 (diff) | |
| download | kolla-cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c.tar.gz kolla-cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c.zip | |
Common start.sh
The majority of the start.sh code is identical. This removes that
duplicate code while still maintaining the ability to call code in a
specific container.
The start.sh is moved into /usr/local/bin/kolla_start in the container
The extend_start.sh script is called by the kolla_start script at the
location /usr/local/bin/kolla_extend_start . It always exists because
we create a noop kolla_extend_start in the base directory. We override
it with extend_start.sh in a specific image should we need to.
Of note, the neutron-agents container is exempt from this new
structure due to it being a fat container.
Additionally, we fix the inconsistent permissions throughout. 644 for
repo files and the scripts are set to 755 via a Docker RUN command to
ensure someones local perm change won't break upstream containers.
Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad
Closes-Bug: #1501295
Diffstat (limited to 'docker/keepalived')
| -rw-r--r-- | docker/keepalived/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/keepalived/check_alive.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/keepalived/extend_start.sh (renamed from docker/keepalived/start.sh) | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 9fbc7c49a..717439a6c 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -18,8 +18,9 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -COPY start.sh check_alive.sh / +COPY check_alive.sh / -CMD ["/start.sh"] +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh {{ include_footer }} diff --git a/docker/keepalived/check_alive.sh b/docker/keepalived/check_alive.sh index 8c2684f10..8c2684f10 100755..100644 --- a/docker/keepalived/check_alive.sh +++ b/docker/keepalived/check_alive.sh diff --git a/docker/keepalived/start.sh b/docker/keepalived/extend_start.sh index 1d96c3bfa..e1fe5d9d8 100755..100644 --- a/docker/keepalived/start.sh +++ b/docker/keepalived/extend_start.sh @@ -1,8 +1,4 @@ #!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh modprobe ip_vs @@ -10,5 +6,3 @@ modprobe ip_vs if [ -f /run/keepalived.pid ]; then rm /run/keepalived.pid fi - -exec $CMD |