vexxhost/openstack-operator
Code Issues Proposed changes

Add applicationcredential to glance

Browse Source 
Change-Id: If51a193aad4420fe011d628a208c7e19ca6ad85c
This commit is contained in:
okozachenko 2020-08-10 22:34:52 +03:00
parent 4e3df13c29
commit ca6f30ab71
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/lib/glance
View File

@ -45,7 +45,14 @@ function configure_glance {
iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG
iniset $GLANCE_API_CONF oslo_concurrency lock_path $GLANCE_LOCK_DIR iniset $GLANCE_API_CONF oslo_concurrency lock_path $GLANCE_LOCK_DIR
iniset $GLANCE_API_CONF paste_deploy flavor keystone iniset $GLANCE_API_CONF paste_deploy flavor keystone
configure_keystone_authtoken_middleware $GLANCE_API_CONF glance kubernetes_ensure_resource secret/glance-application-credential
GLANCE_APPLICATION_CREDENTIAL_SECRET=$(get_data_from_secret glance-application-credential openstack secret)
GLANCE_APPLICATION_CREDENTIAL_ID=$(get_data_from_secret glance-application-credential openstack id)
iniset $GLANCE_API_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3
iniset $GLANCE_API_CONF keystone_authtoken auth_type v3applicationcredential
iniset $GLANCE_API_CONF keystone_authtoken application_credential_id $GLANCE_APPLICATION_CREDENTIAL_ID
iniset $GLANCE_API_CONF keystone_authtoken application_credential_secret $GLANCE_APPLICATION_CREDENTIAL_SECRET
iniset $GLANCE_API_CONF oslo_messaging_notifications driver messagingv2 iniset $GLANCE_API_CONF oslo_messaging_notifications driver messagingv2
iniset_rpc_backend glance $GLANCE_API_CONF iniset_rpc_backend glance $GLANCE_API_CONF
if [ "$VIRT_DRIVER" = 'xenserver' ]; then if [ "$VIRT_DRIVER" = 'xenserver' ]; then
@ -122,7 +129,7 @@ function configure_glance {
# create_glance_accounts() - Set up common required glance accounts # create_glance_accounts() - Set up common required glance accounts
function create_glance_accounts { function create_glance_accounts {
create_service_user "glance" echo noop
} }
export -f create_glance_accounts export -f create_glance_accounts

3
openstack_operator/glance.py
View File

@ -50,6 +50,9 @@ def create_or_resume(name, spec, **_):
name=name, spec=spec) name=name, spec=spec)
url = spec["ingress"]["host"] url = spec["ingress"]["host"]
# Create application credential
identity.ensure_application_credential(name="glance")
if "endpoint" not in spec: if "endpoint" not in spec:
spec["endpoint"] = True spec["endpoint"] = True
if spec["endpoint"]: if spec["endpoint"]: