openstack/kolla-ansible
Code Issues Proposed changes

it turns out that openstack-db is terrible

Browse Source
This commit is contained in:
Lars Kellogg-Stedman 2014-09-18 13:22:47 -04:00
parent 60b9ffa262
commit e02ada9423
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/keystone/Dockerfile
View File

@ -2,8 +2,11 @@ FROM rhel7
MAINTAINER jlabocki@redhat.com
#Install required packages
RUN yum install -y wget procps-ng net-tools && yum clean all
RUN yum install -y openstack-keystone openstack-utils openstack-selinux && yum clean all
RUN yum install -y openstack-keystone \
openstack-utils \
openstack-selinux \
mariadb \
&& yum clean all
ADD ./start.sh /start.sh

9
docker/keystone/start.sh
View File

@ -7,7 +7,14 @@ if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
KEYSTONE_ADMIN_TOKEN=$(openssl -hex 15)
fi
/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password ${KEYSTONE_DB_PASSWORD}
# This is a terrible, terrible idea.
#/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password ${KEYSTONE_DB_PASSWORD}
mysql -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS keystone;
GRANT ALL PRIVILEGES ON keystone.* TO
'keystone'@'%' IDENTIFIED BY '${KEYSTONE_DB_PASSWORD}'
EOF
crudini --set /etc/keystone/keystone.conf \
database \