Add config-internal/config-external for barbican
Partially Implements: Blueprint standard-start Change-Id: I34b4d96515b4c68d42319b477504abdfe9581bad
This commit is contained in:
Swapnil Kulkarni
parent
fcda6a06d8
commit
ba1901de65
1
docker/centos/binary/barbican/config-external.sh
Symbolic link
1
docker/centos/binary/barbican/config-external.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../../../common/barbican/config-external.sh
|
||||
1
docker/centos/binary/barbican/config-internal.sh
Symbolic link
1
docker/centos/binary/barbican/config-internal.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../../../common/barbican/config-internal.sh
|
||||
10
docker/common/barbican/config-external.sh
Normal file
10
docker/common/barbican/config-external.sh
Normal file
@ -0,0 +1,10 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/barbican/barbican.conf"
|
||||
TARGET="/etc/barbican/barbican.conf"
|
||||
OWNER="barbican"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
75
docker/common/barbican/config-internal.sh
Normal file
75
docker/common/barbican/config-internal.sh
Normal file
@ -0,0 +1,75 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
if ! [ "$BARBICAN_DB_PASSWORD" ]; then
|
||||
BARBICAN_DB_PASSWORD=$(openssl rand -hex 15)
|
||||
export BARBICAN_DB_PASSWORD
|
||||
fi
|
||||
|
||||
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
|
||||
KEYSTONE_ADMIN_SERVICE_PORT BARBICAN_ADMIN_PASSWORD
|
||||
fail_unless_db
|
||||
fail_unless_os_service_running keystone
|
||||
|
||||
mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF
|
||||
CREATE DATABASE IF NOT EXISTS ${BARBICAN_DB_NAME};
|
||||
GRANT ALL PRIVILEGES ON barbican.* TO
|
||||
'${BARBICAN_DB_USER}'@'%' IDENTIFIED BY '${BARBICAN_DB_PASSWORD}'
|
||||
EOF
|
||||
|
||||
# config file setup
|
||||
crudini --set /etc/barbican/barbican-api.conf \
|
||||
DEFAULT \
|
||||
sql_connection \
|
||||
"mysql://${BARBICAN_DB_USER}:${BARBICAN_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${BARBICAN_DB_NAME}"
|
||||
crudini --set /etc/barbican/barbican-api.conf \
|
||||
DEFAULT \
|
||||
log_dir \
|
||||
"/var/log/barbican/"
|
||||
crudini --set /etc/barbican/barbican-api.conf \
|
||||
DEFAULT \
|
||||
log_file \
|
||||
"/var/log/barbican/barbican.log"
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
pipeline:barbican_api \
|
||||
pipeline \
|
||||
"keystone_authtoken context apiapp"
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
auth_host \
|
||||
${KEYSTONE_ADMIN_SERVICE_HOST}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
auth_port \
|
||||
${KEYSTONE_ADMIN_SERVICE_PORT}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
auth_protocol \
|
||||
${KEYSTONE_AUTH_PROTOCOL}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
admin_tenant_name \
|
||||
${ADMIN_TENANT_NAME}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
admin_user \
|
||||
${BARBICAN_KEYSTONE_USER}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
admin_password \
|
||||
${BARBICAN_KEYSTONE_USER}
|
||||
|
||||
# create the required keystone entities for barbican
|
||||
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
|
||||
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
|
||||
|
||||
keystone user-get ${BARBICAN_KEYSTONE_USER} > /dev/null 2>&1 || /bin/keystone user-create --name ${BARBICAN_KEYSTONE_USER} --pass ${BARBICAN_ADMIN_PASSWORD}
|
||||
|
||||
keystone role-get observer > /dev/null 2>&1 || /bin/keystone role-create --name observer
|
||||
keystone role-get creator > /dev/null 2>&1 || /bin/keystone role-create --name creator
|
||||
|
||||
keystone user-get ${BARBICAN_KEYSTONE_USER} > /dev/null 2>&1 || /bin/keystone user-role-add --user ${BARBICAN_KEYSTONE_USER} --role admin --tenant ${ADMIN_TENANT_NAME}
|
||||
|
||||
# launch Barbican using uwsgi
|
||||
exec uwsgi --master --emperor /etc/barbican/vassals
|
||||
@ -1,81 +1,22 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -o errexit
|
||||
|
||||
: ${BARBICAN_DB_USER:=barbican}
|
||||
: ${BARBICAN_DB_NAME:=barbican}
|
||||
: ${KEYSTONE_AUTH_PROTOCOL:=http}
|
||||
: ${BARBICAN_KEYSTONE_USER:=barbican}
|
||||
: ${ADMIN_TENANT_NAME:=admin}
|
||||
CMD="uwsgi"
|
||||
ARGS="--master --emperor"
|
||||
|
||||
if ! [ "$BARBICAN_DB_PASSWORD" ]; then
|
||||
BARBICAN_DB_PASSWORD=$(openssl rand -hex 15)
|
||||
export BARBICAN_DB_PASSWORD
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
|
||||
# Config-internal script exec out of this function, it does not return here.
|
||||
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 "barbican-manage db_sync" barbican
|
||||
exit 0
|
||||
fi
|
||||
|
||||
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
|
||||
KEYSTONE_ADMIN_SERVICE_PORT BARBICAN_ADMIN_PASSWORD
|
||||
fail_unless_db
|
||||
fail_unless_os_service_running keystone
|
||||
exec $CMD $ARGS
|
||||
|
||||
mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <<EOF
|
||||
CREATE DATABASE IF NOT EXISTS ${BARBICAN_DB_NAME};
|
||||
GRANT ALL PRIVILEGES ON barbican.* TO
|
||||
'${BARBICAN_DB_USER}'@'%' IDENTIFIED BY '${BARBICAN_DB_PASSWORD}'
|
||||
EOF
|
||||
|
||||
# config file setup
|
||||
crudini --set /etc/barbican/barbican-api.conf \
|
||||
DEFAULT \
|
||||
sql_connection \
|
||||
"mysql://${BARBICAN_DB_USER}:${BARBICAN_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${BARBICAN_DB_NAME}"
|
||||
crudini --set /etc/barbican/barbican-api.conf \
|
||||
DEFAULT \
|
||||
log_dir \
|
||||
"/var/log/barbican/"
|
||||
crudini --set /etc/barbican/barbican-api.conf \
|
||||
DEFAULT \
|
||||
log_file \
|
||||
"/var/log/barbican/barbican.log"
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
pipeline:barbican_api \
|
||||
pipeline \
|
||||
"keystone_authtoken context apiapp"
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
auth_host \
|
||||
${KEYSTONE_ADMIN_SERVICE_HOST}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
auth_port \
|
||||
${KEYSTONE_ADMIN_SERVICE_PORT}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
auth_protocol \
|
||||
${KEYSTONE_AUTH_PROTOCOL}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
admin_tenant_name \
|
||||
${ADMIN_TENANT_NAME}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
admin_user \
|
||||
${BARBICAN_KEYSTONE_USER}
|
||||
crudini --set /etc/barbican/barbican-api-paste.ini \
|
||||
filter:keystone_authtoken \
|
||||
admin_password \
|
||||
${BARBICAN_KEYSTONE_USER}
|
||||
|
||||
# create the required keystone entities for barbican
|
||||
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
|
||||
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
|
||||
|
||||
keystone user-get ${BARBICAN_KEYSTONE_USER} > /dev/null 2>&1 || /bin/keystone user-create --name ${BARBICAN_KEYSTONE_USER} --pass ${BARBICAN_ADMIN_PASSWORD}
|
||||
|
||||
keystone role-get observer > /dev/null 2>&1 || /bin/keystone role-create --name observer
|
||||
keystone role-get creator > /dev/null 2>&1 || /bin/keystone role-create --name creator
|
||||
|
||||
keystone user-get ${BARBICAN_KEYSTONE_USER} > /dev/null 2>&1 || /bin/keystone user-role-add --user ${BARBICAN_KEYSTONE_USER} --role admin --tenant ${ADMIN_TENANT_NAME}
|
||||
|
||||
# launch Barbican using uwsgi
|
||||
exec uwsgi --master --emperor /etc/barbican/vassals
|
||||
|
||||
12
tools/genenv
12
tools/genenv
@ -235,6 +235,13 @@ CINDER_ENABLED_BACKEND=lvm57
|
||||
# Here we define pairs hostname:priority. Priorities have to be unique
|
||||
KEEPALIVED_HOST_PRIORITIES=host1:100,host2:99
|
||||
|
||||
#Barbican
|
||||
BARBICAN_DB_USER=barbican
|
||||
BARBICAN_DB_NAME=barbican
|
||||
KEYSTONE_AUTH_PROTOCOL=http
|
||||
BARBICAN_KEYSTONE_USER=barbican
|
||||
ADMIN_TENANT_NAME=admin
|
||||
|
||||
# this should use the keystone admin port
|
||||
# https://bugs.launchpad.net/kolla/+bug/1469209
|
||||
cat > ./openrc <<EOF
|
||||
@ -400,6 +407,11 @@ INIT_HEAT_DB=$INIT_HEAT_DB
|
||||
INIT_KEYSTONE_DB=$INIT_KEYSTONE_DB
|
||||
INIT_NOVA_DB=$INIT_NOVA_DB
|
||||
KEEPALIVED_HOST_PRIORITIES=$KEEPALIVED_HOST_PRIORITIES
|
||||
BARBICAN_DB_USER=$BARBICAN_DB_USER
|
||||
BARBICAN_DB_NAME=$BARBICAN_DB_NAME
|
||||
KEYSTONE_AUTH_PROTOCOL=$KEYSTONE_AUTH_PROTOCOL
|
||||
BARBICAN_KEYSTONE_USER=$BARBICAN_KEYSTONE_USER
|
||||
ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
|
||||
|
||||
EOF
|
||||
echo Please customize your FLAT_INTERFACE to a different network then your
|
||||
|
||||
Loading…
Reference in New Issue
Block a user