From 3ac7da64d12c631def3640369998d292fd1a199f Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Wed, 17 Jun 2015 08:11:44 +0000 Subject: 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 --- docker/centos/binary/keystone/Dockerfile | 4 ++-- docker/centos/binary/keystone/config-external.sh | 1 + docker/centos/binary/keystone/config-internal.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 120000 docker/centos/binary/keystone/config-external.sh create mode 120000 docker/centos/binary/keystone/config-internal.sh (limited to 'docker/centos/binary') 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 -- cgit v1.2.3