Move scripts for keystone to docker_templates

Change-Id: I71ba1998215913fdffaa335c270a622af113e1da
This commit is contained in:
Steven Dake 2015-08-27 18:14:30 -07:00
parent 2cbccd7dc1
commit a7109a1f8b
4 changed files with 73 additions and 75 deletions

View File

@ -1,25 +0,0 @@
#!/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

View File

@ -1,48 +0,0 @@
#!/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

View File

@ -1 +0,0 @@
../../docker/common/keystone/config-external.sh

View File

@ -0,0 +1,25 @@
#!/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

View File

@ -1 +0,0 @@
../../docker/common/keystone/start.sh

View File

@ -0,0 +1,48 @@
#!/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