diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-30 21:34:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-30 21:34:49 +0000 |
| commit | 90d92347e83e348ef5e2f1ed2faba2a3820ab436 (patch) | |
| tree | 5d8dd8a5c1a26971050ec54d16ca2ff82e8c720a /docker/centos | |
| parent | cc9432a57476ee043f81700e811d33f78f66adaf (diff) | |
| parent | 3ac7da64d12c631def3640369998d292fd1a199f (diff) | |
| download | kolla-90d92347e83e348ef5e2f1ed2faba2a3820ab436.tar.gz kolla-90d92347e83e348ef5e2f1ed2faba2a3820ab436.zip | |
Merge "Add initial config function and keystone support"
Diffstat (limited to 'docker/centos')
| -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 |