diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-01 07:43:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-06 03:30:53 +0000 |
| commit | 94162bd08f40ec742a7bfcdcd4aac45be5bd5618 (patch) | |
| tree | 4a0027d671f3e14449663c29d6c95dc0dbe0cee0 /docker/haproxy/ensure_latest_config.sh | |
| parent | cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (diff) | |
| download | kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.tar.gz kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.zip | |
Bring Kolla inline with FHS
This brings Kolla images inline with FHS and should make finding
locations of things more consistent and reliable with the linux world
at large.
Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8
Closes-Bug: #1485742
Diffstat (limited to 'docker/haproxy/ensure_latest_config.sh')
| -rw-r--r-- | docker/haproxy/ensure_latest_config.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/haproxy/ensure_latest_config.sh b/docker/haproxy/ensure_latest_config.sh index af20175a6..9a34f1758 100644 --- a/docker/haproxy/ensure_latest_config.sh +++ b/docker/haproxy/ensure_latest_config.sh @@ -1,11 +1,11 @@ #!/bin/bash CURRENT_CONFIG_HASH=$(sha1sum /etc/haproxy/haproxy.cfg | cut -f1 -d' ') -NEW_CONFIG_HASH=$(sha1sum /opt/kolla/config_files/haproxy.cfg | cut -f1 -d' ') +NEW_CONFIG_HASH=$(sha1sum /var/lib/kolla/config_files/haproxy.cfg | cut -f1 -d' ') if [[ $CURRENT_CONFIG_HASH != $NEW_CONFIG_HASH ]]; then changed=changed - source /opt/kolla/config-external.sh + python /usr/local/bin/kolla_set_configs /usr/sbin/haproxy -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -sf $(cat /run/haproxy.pid) fi |