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/base | |
| 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/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/set_configs.py | 2 | ||||
| -rw-r--r-- | docker/base/start.sh | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c17cfa25e..28924b0d5 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -188,10 +188,9 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD {% endif %} -COPY set_configs.py /opt/kolla/ - +COPY set_configs.py /usr/local/bin/kolla_set_configs COPY start.sh /usr/local/bin/kolla_start RUN touch /usr/local/bin/kolla_extend_start \ - && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /opt/kolla/set_configs.py + && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs CMD ["kolla_start"] diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 941e74ca2..12da192c0 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -140,7 +140,7 @@ def set_permissions(data): def load_config(): - config_file = '/opt/kolla/config_files/config.json' + config_file = '/var/lib/kolla/config_files/config.json' LOG.info('Loading config file at {}'.format(config_file)) # Attempt to read config file diff --git a/docker/base/start.sh b/docker/base/start.sh index 7d89f636c..bbe321a80 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -2,7 +2,7 @@ set -o errexit # Processing /opt/kolla/config_files/config.json -python /opt/kolla/set_configs.py +python /usr/local/bin/kolla_set_configs CMD=$(cat /run_command) ARGS="" |