aboutsummaryrefslogtreecommitdiff
path: root/docker_templates
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 18:14:30 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:29 -0700
commita7109a1f8bcf0f4ec1fa2dad63d4a76fcfbcaf8a (patch)
tree3d38bf8183ab74e21238b78c842c34bb7daa3f13 /docker_templates
parent2cbccd7dc188c30ca81b1e96330df36425b0cf17 (diff)
downloadkolla-a7109a1f8bcf0f4ec1fa2dad63d4a76fcfbcaf8a.tar.gz
kolla-a7109a1f8bcf0f4ec1fa2dad63d4a76fcfbcaf8a.zip
Move scripts for keystone to docker_templates
Change-Id: I71ba1998215913fdffaa335c270a622af113e1da
Diffstat (limited to 'docker_templates')
-rw-r--r--[l---------]docker_templates/keystone/config-external.sh26
-rwxr-xr-x[l---------]docker_templates/keystone/start.sh49
2 files changed, 73 insertions, 2 deletions
diff --git a/docker_templates/keystone/config-external.sh b/docker_templates/keystone/config-external.sh
index f8576512c..1bd4e3bb4 120000..100644
--- a/docker_templates/keystone/config-external.sh
+++ b/docker_templates/keystone/config-external.sh
@@ -1 +1,25 @@
-../../docker/common/keystone/config-external.sh \ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/keystone/keystone.conf"
+TARGET="/etc/keystone/keystone.conf"
+OWNER="keystone"
+
+if [[ -f "$SOURCE" ]]; then
+ cp $SOURCE $TARGET
+ chown ${OWNER}: $TARGET
+ chmod 0644 $TARGET
+fi
+
+if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
+ "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
+ SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf"
+ TARGET_WSGI="/etc/apache2/conf-enabled/wsgi-keystone.conf"
+else
+ SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf"
+ TARGET_WSGI="/etc/httpd/conf.d/wsgi-keystone.conf"
+fi
+
+if [[ -f "$SOURCE_WSGI" ]]; then
+ cp $SOURCE_WSGI $TARGET_WSGI
+ chown ${OWNER}: $TARGET_WSGI
+ chmod 0644 $TARGET_WSGI
+fi
diff --git a/docker_templates/keystone/start.sh b/docker_templates/keystone/start.sh
index 331b4b554..d964b0303 120000..100755
--- a/docker_templates/keystone/start.sh
+++ b/docker_templates/keystone/start.sh
@@ -1 +1,48 @@
-../../docker/common/keystone/start.sh \ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+# Loading common functions
+source /opt/kolla/kolla-common.sh
+
+if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
+ "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
+ CMD="/usr/sbin/apache2"
+ ARGS="-DFOREGROUND"
+
+ # Loading Apache2 ENV variables
+ source /etc/apache2/envvars
+else
+ CMD="/usr/sbin/httpd"
+ ARGS="-DFOREGROUND"
+fi
+
+# Execute config strategy
+set_configs
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+ su -s /bin/sh -c "keystone-manage db_sync" keystone
+
+ # Start the api to set initial endpoint and users with the admin_token
+ $CMD
+ sleep 5
+
+ keystone service-create --name keystone --type identity \
+ --description "OpenStack Identity"
+ keystone endpoint-create --region "${REGION_NAME}" \
+ --publicurl "${PUBLIC_URL}" \
+ --internalurl "${INTERNAL_URL}" \
+ --adminurl "${ADMIN_URL}" \
+ --service-id $(keystone service-list | awk '/ identity / {print $2}')
+
+ keystone tenant-create --description "Admin Project" --name admin
+ keystone user-create --pass "${KEYSTONE_ADMIN_PASSWORD}" --name admin
+ keystone role-create --name admin
+ keystone user-role-add --user admin --tenant admin --role admin
+
+ exit 0
+fi
+
+exec $CMD $ARGS