openstack/kolla-ansible
Code Issues Proposed changes

Merge "correct various issues with glance images and configs"

Browse Source
This commit is contained in:
Jenkins
2014-10-13 15:02:26 +00:00
committed by Gerrit Code Review
parent 03f616f87c a4069300aa
commit 866ff0d590
4 changed files with 97 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
docker/glance/glance-api/start.sh
View File

@@ -10,14 +10,19 @@ fi
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
crux user-create -n "${GLANCE_KEYSTONE_USER}" \ while ! curl -o /dev/null -s --fail ${SERVICE_ENDPOINT}; do
-p "${GLANCE_KEYSTONE_PASSWORD}" \ echo "waiting for keystone..."
-t "${ADMIN_TENANT_NAME}" \ sleep 1;
-r admin done
crux endpoint-create -n glance -t image \ crux user-create --update -n "${GLANCE_KEYSTONE_USER}" \
-I "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292" \ -p "${GLANCE_KEYSTONE_PASSWORD}" \
-P "http://${PUBLIC_IP}:9292" \ -t "${ADMIN_TENANT_NAME}" \
-A "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292" -r admin
crux endpoint-create --remove-all -n glance -t image \
-I "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292" \
-P "http://${PUBLIC_IP}:9292" \
-A "http://${GLANCE_API_PORT_9292_TCP_ADDR}:9292"
exec /usr/bin/glance-api exec /usr/bin/glance-api

25
docker/glance/glance-base/config-glance.sh
View File

@@ -14,14 +14,14 @@ MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
: ${KEYSTONE_AUTH_PROTOCOL:=http} : ${KEYSTONE_AUTH_PROTOCOL:=http}
: ${PUBLIC_IP:=$MY_IP} : ${PUBLIC_IP:=$MY_IP}
if ! [ "$GLANCE_DB_PASSWORD" ]; then if [ -z "$GLANCE_DB_PASSWORD" ]; then
GLANCE_DB_PASSWORD=$(openssl rand -hex 15) echo "ERROR: missing GLANCE_DB_PASSWORD" >&2
export GLANCE_DB_PASSWORD exit 1
fi fi
if ! [ "$GLANCE_KEYSTONE_PASSWORD" ]; then if [ -z "$GLANCE_KEYSTONE_PASSWORD" ]; then
GLANCE_KEYSTONE_PASSWORD=$(openssl rand -hex 15) echo "ERROR: missing GLANCE_KEYSTONE_PASSWORD" >&2
export GLANCE_KEYSTONE_PASSWORD exit 1
fi fi
if ! [ -f /startconfig ]; then if ! [ -f /startconfig ]; then
@@ -37,6 +37,13 @@ GLANCE_KEYSTONE_PASSWORD=${GLANCE_KEYSTONE_PASSWORD}
EOF EOF
fi fi
cat > /openrc <<EOF
export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR}:5000/v2.0"
export OS_USERNAME="${GLANCE_KEYSTONE_USER}"
export OS_PASSWORD="${GLANCE_KEYSTONE_PASSWORD}"
export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
EOF
for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
crudini --del $cfg \ crudini --del $cfg \
DEFAULT \ DEFAULT \
@@ -48,10 +55,6 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
$option $option
done done
crudini --set $cfg \
DEFAULT \
bind_host \
$MY_IP
crudini --set $cfg \ crudini --set $cfg \
keystone_authtoken \ keystone_authtoken \
auth_uri \ auth_uri \
@@ -59,7 +62,7 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
crudini --set $cfg \ crudini --set $cfg \
keystone_authtoken \ keystone_authtoken \
admin_tenant_name \ admin_tenant_name \
"${ADMIN_TENANT_NAME}" "${ADMIN_TENANT_NAME}"
crudini --set $cfg \ crudini --set $cfg \
keystone_authtoken \ keystone_authtoken \
admin_user \ admin_user \

6
docker/glance/glance-registry/start.sh
View File

@@ -2,6 +2,12 @@
. /opt/glance/config-glance.sh . /opt/glance/config-glance.sh
# wait for mysql to start
while ! mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} -e "select 1" mysql > /dev/null 2>&1; do
echo "waiting for mysql..."
sleep 1
done
mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8; CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8;
GRANT ALL PRIVILEGES ON ${GLANCE_DB_NAME}.* TO GRANT ALL PRIVILEGES ON ${GLANCE_DB_NAME}.* TO

120
k8s/pod/glance-pod.json
View File

@@ -1,60 +1,68 @@
{ {
"desiredState": { "labels": {
"manifest": { "name": "glance"
"containers": [ },
{ "id": "glance",
"env": [ "desiredState": {
{ "manifest": {
"name": "DB_ROOT_PASSWORD", "version": "v1beta1",
"value": "password" "id": "glance-1",
}, "containers": [
{ {
"name": "GLANCE_DB_PASSWORD", "ports": [
"value": "password" {
}, "containerPort": 9191
{ }
"name": "KEYSTONE_ADMIN_TOKEN", ],
"value": "ADMINTOKEN" "name": "glance-registry",
} "image": "kollaglue/fedora-rdo-glance-registry",
], "env": [
"image": "kollaglue/fedora-rdo-glance-registry", {
"name": "glance-registry", "value": "password",
"ports": [ "name": "DB_ROOT_PASSWORD"
{ },
"containerPort": 9191 {
} "value": "password",
] "name": "GLANCE_DB_PASSWORD"
}, },
{ {
"env": [ "value": "password",
{ "name": "GLANCE_KEYSTONE_PASSWORD"
"name": "DB_ROOT_PASSWORD", },
"value": "password" {
}, "value": "ADMINTOKEN",
{ "name": "KEYSTONE_ADMIN_TOKEN"
"name": "GLANCE_DB_PASSWORD", }
"value": "password" ]
}, },
{ {
"name": "KEYSTONE_ADMIN_TOKEN", "ports": [
"value": "ADMINTOKEN" {
} "containerPort": 9292
], }
"image": "kollaglue/fedora-rdo-glance-api", ],
"name": "glance-api", "name": "glance-api",
"ports": [ "image": "kollaglue/fedora-rdo-glance-api",
{ "env": [
"containerPort": 9292 {
} "value": "password",
] "name": "DB_ROOT_PASSWORD"
} },
], {
"id": "glance-1", "value": "password",
"version": "v1beta1" "name": "GLANCE_DB_PASSWORD"
},
{
"value": "password",
"name": "GLANCE_KEYSTONE_PASSWORD"
},
{
"value": "ADMINTOKEN",
"name": "KEYSTONE_ADMIN_TOKEN"
}
]
} }
}, ]
"id": "glance",
"labels": {
"name": "glance"
} }
}
} }