897337cdd6
The only files in the docker image directories that differ majorly between distros are the Dockerfiles (e.g. different package manager mechanisms, different repo sources, etc). The supporting files such as the start.sh/check.sh and config files should largely stay the same between base images. This change moves these files up into a "common" directory, and symlinks them in the same way that the build script is managed. This means when adding a new base distro only new Dockerfiles need to be created. Also, if a distro does happen to require a vastly different start.sh script for example, one can choose to simply not symlink to the common and instead drop in a custom one. Implements: blueprint refactor-base-image-layout Change-Id: Ic4db69d31ff54a1fb95af4853a2e5ae490064284
64 lines
1.5 KiB
Bash
64 lines
1.5 KiB
Bash
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
. /opt/kolla/kolla-common.sh
|
|
|
|
: ${ADMIN_TENANT_NAME:=admin}
|
|
: ${GLANCE_DB_NAME:=glance}
|
|
: ${GLANCE_DB_USER:=glance}
|
|
: ${GLANCE_KEYSTONE_USER:=glance}
|
|
: ${KEYSTONE_AUTH_PROTOCOL:=http}
|
|
: ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR}
|
|
|
|
check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD
|
|
dump_vars
|
|
|
|
cat > /openrc <<EOF
|
|
export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}: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
|
|
crudini --set $cfg \
|
|
DEFAULT \
|
|
log_file \
|
|
""
|
|
|
|
for option in auth_protocol auth_host auth_port; do
|
|
crudini --del $cfg \
|
|
keystone_authtoken \
|
|
$option
|
|
done
|
|
|
|
crudini --set $cfg \
|
|
keystone_authtoken \
|
|
auth_uri \
|
|
"http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/"
|
|
crudini --set $cfg \
|
|
keystone_authtoken \
|
|
admin_tenant_name \
|
|
"${ADMIN_TENANT_NAME}"
|
|
crudini --set $cfg \
|
|
keystone_authtoken \
|
|
admin_user \
|
|
"${GLANCE_KEYSTONE_USER}"
|
|
crudini --set $cfg \
|
|
keystone_authtoken \
|
|
admin_password \
|
|
"${GLANCE_KEYSTONE_PASSWORD}"
|
|
|
|
crudini --set $cfg \
|
|
paste_deploy \
|
|
flavor \
|
|
keystone
|
|
|
|
crudini --set $cfg \
|
|
database \
|
|
connection \
|
|
"mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${GLANCE_DB_NAME}"
|
|
done
|
|
|