aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorAlicja Kwasniewska <alicja.kwasniewska@intel.com>2015-07-02 17:08:59 +0000
committerPaul Bourke <paul.bourke@oracle.com>2015-07-09 11:06:58 +0000
commitfcda6a06d8eee9d3f3199962b36a04a8c702072c (patch)
treec2377e1bd49612caef7dc0462d3a8633cd31d907 /docker/common
parent370736abb761df28ad497cf354ce7394d5b2e1cc (diff)
downloadkolla-fcda6a06d8eee9d3f3199962b36a04a8c702072c.tar.gz
kolla-fcda6a06d8eee9d3f3199962b36a04a8c702072c.zip
Keystone installation from source
Makes use of new gen-source-tar script to provide a source based keystone image. This patch introduces a new concept of a .buildinfo file, which provides variables specific to the image being built which cannot be defaulted in a generic way, at least until the build script is overhauled. This file is sourced before the .buildconf which still leaves everything customisable by the user. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: I0ec6b9cfe6d4173f3192e4ae5833fb0f6d333f1c Implements: blueprint install-from-source
Diffstat (limited to 'docker/common')
-rwxr-xr-xdocker/common/keystone/config-internal.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/common/keystone/config-internal.sh b/docker/common/keystone/config-internal.sh
index 527870fdf..2d522b699 100755
--- a/docker/common/keystone/config-internal.sh
+++ b/docker/common/keystone/config-internal.sh
@@ -112,9 +112,6 @@ export OS_PASSWORD=${KEYSTONE_ADMIN_PASSWORD}
export OS_TENANT_NAME=${ADMIN_TENANT_NAME}
EOF
-# Create keystone user and group if they don't exist
-id -u keystone &>/dev/null || useradd --user-group keystone
-
# Run PKI Setup script
echo "Setting up PKI"
/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone