diff options
| author | Sam Yaple <sam@yaple.net> | 2015-06-17 08:11:44 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-06-30 17:26:23 +0000 |
| commit | 3ac7da64d12c631def3640369998d292fd1a199f (patch) | |
| tree | 9198ece863949437490f58c88cbea664c8b6b961 /docker/centos/binary | |
| parent | 6370bf25cb3c624067d7327ef54bf2fe654c87be (diff) | |
| download | kolla-3ac7da64d12c631def3640369998d292fd1a199f.tar.gz kolla-3ac7da64d12c631def3640369998d292fd1a199f.zip | |
Add initial config function and keystone support
Add set_configs function that implements the flow from the proposed
ansible-multi spec. Move start.sh to config-internal.sh to preserve existing
behaviour.
config-externall.sh copies the appropriate configs in from the bind'd
location and sets permissions and ownership appropriately.
Partially Implements: blueprint ansible-multi
Change-Id: I53fca0660451087f273fefc3c63e0d8cf1a2c096
Diffstat (limited to 'docker/centos/binary')
| -rw-r--r-- | docker/centos/binary/keystone/Dockerfile | 4 | ||||
| l--------- | docker/centos/binary/keystone/config-external.sh | 1 | ||||
| l--------- | docker/centos/binary/keystone/config-internal.sh | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile index f8db5f582..e05db2fde 100644 --- a/docker/centos/binary/keystone/Dockerfile +++ b/docker/centos/binary/keystone/Dockerfile @@ -17,8 +17,8 @@ RUN chown -R keystone:keystone /var/www/cgi-bin/keystone RUN chmod 755 /var/www/cgi-bin/keystone/* # Add start-up and check scripts -COPY ./start.sh /start.sh -COPY ./check.sh /check.sh +COPY start.sh check.sh / +COPY config-internal.sh config-external.sh /opt/kolla/ # Run the Keystone start script CMD ["/start.sh"] diff --git a/docker/centos/binary/keystone/config-external.sh b/docker/centos/binary/keystone/config-external.sh new file mode 120000 index 000000000..ae5be7eea --- /dev/null +++ b/docker/centos/binary/keystone/config-external.sh @@ -0,0 +1 @@ +../../../common/keystone/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/keystone/config-internal.sh b/docker/centos/binary/keystone/config-internal.sh new file mode 120000 index 000000000..fe8d98c1f --- /dev/null +++ b/docker/centos/binary/keystone/config-internal.sh @@ -0,0 +1 @@ +../../../common/keystone/config-internal.sh
\ No newline at end of file |