openstack/devstack
Code Issues Proposed changes

Clean up unified limits configuration for nova and glance

Browse Source 
This is a followup for change Ifdef3510bc7da3098a71739814e35dbaf612ae34
which added configuration of unified limits for nova. This removes an
unnecessary wrapper unsetting of OS_ env variables, unnecessary quoting
on an iniset config value, and a hardcoding of user domain. The glance
code from which the nova code was originally copied is also cleaned up.

Change-Id: I4921af5cc0f624dd5aa848533f7049ee816be593
This commit is contained in:
melanie witt 2022-03-03 23:54:49 +00:00
parent a435078fcb
commit 2c96180ac8
2 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/glance
View File

@ -309,13 +309,13 @@ function configure_glance_quotas {
iniset $GLANCE_API_CONF oslo_limit username glance iniset $GLANCE_API_CONF oslo_limit username glance
iniset $GLANCE_API_CONF oslo_limit auth_type password iniset $GLANCE_API_CONF oslo_limit auth_type password
iniset $GLANCE_API_CONF oslo_limit auth_url $KEYSTONE_SERVICE_URI iniset $GLANCE_API_CONF oslo_limit auth_url $KEYSTONE_SERVICE_URI
iniset $GLANCE_API_CONF oslo_limit system_scope "'all'" iniset $GLANCE_API_CONF oslo_limit system_scope all
iniset $GLANCE_API_CONF oslo_limit endpoint_id \ iniset $GLANCE_API_CONF oslo_limit endpoint_id \
$(openstack --os-cloud devstack-system-admin endpoint list --service glance -f value -c ID) $(openstack --os-cloud devstack-system-admin endpoint list --service glance -f value -c ID)
# Allow the glance service user to read quotas # Allow the glance service user to read quotas
openstack --os-cloud devstack-system-admin role add --user glance --user-domain Default \ openstack --os-cloud devstack-system-admin role add --user glance \
--system all reader --user-domain $SERVICE_DOMAIN_NAME --system all reader
} }
# configure_glance() - Set config files, create data dirs, etc # configure_glance() - Set config files, create data dirs, etc

67
lib/nova
View File

@ -746,42 +746,33 @@ function configure_console_proxies {
} }
function configure_nova_unified_limits { function configure_nova_unified_limits {
# Default limits. Mirror the config-based default values. # Registered limit resources in keystone are system-specific resources.
# Make sure we use a system-scoped token to interact with this API.
# Default limits here mirror the legacy config-based default values.
# Note: disk quota is new in nova as of unified limits. # Note: disk quota is new in nova as of unified limits.
bash -c "unset OS_USERNAME OS_TENANT_NAME OS_PROJECT_NAME; openstack --os-cloud devstack-system-admin registered limit create \
openstack --os-cloud devstack-system-admin registered limit create \ --service nova --default-limit 10 --region $REGION_NAME servers
--service nova --default-limit 10 --region $REGION_NAME \ openstack --os-cloud devstack-system-admin registered limit create \
servers; \ --service nova --default-limit 20 --region $REGION_NAME class:VCPU
openstack --os-cloud devstack-system-admin registered limit create \ openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 20 --region $REGION_NAME \ --service nova --default-limit $((50 * 1024)) --region $REGION_NAME class:MEMORY_MB
class:VCPU; \ openstack --os-cloud devstack-system-admin registered limit create \
openstack --os-cloud devstack-system-admin registered limit create \ --service nova --default-limit 20 --region $REGION_NAME class:DISK_GB
--service nova --default-limit $((50 * 1024)) --region $REGION_NAME \ openstack --os-cloud devstack-system-admin registered limit create \
class:MEMORY_MB; \ --service nova --default-limit 128 --region $REGION_NAME server_metadata_items
openstack --os-cloud devstack-system-admin registered limit create \ openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 20 --region $REGION_NAME \ --service nova --default-limit 5 --region $REGION_NAME server_injected_files
class:DISK_GB; \ openstack --os-cloud devstack-system-admin registered limit create \
openstack --os-cloud devstack-system-admin registered limit create \ --service nova --default-limit 10240 --region $REGION_NAME server_injected_file_content_bytes
--service nova --default-limit 128 --region $REGION_NAME \ openstack --os-cloud devstack-system-admin registered limit create \
server_metadata_items; \ --service nova --default-limit 255 --region $REGION_NAME server_injected_file_path_bytes
openstack --os-cloud devstack-system-admin registered limit create \ openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 5 --region $REGION_NAME \ --service nova --default-limit 100 --region $REGION_NAME server_key_pairs
server_injected_files; \ openstack --os-cloud devstack-system-admin registered limit create \
openstack --os-cloud devstack-system-admin registered limit create \ --service nova --default-limit 10 --region $REGION_NAME server_groups
--service nova --default-limit 10240 --region $REGION_NAME \ openstack --os-cloud devstack-system-admin registered limit create \
server_injected_file_content_bytes; \ --service nova --default-limit 10 --region $REGION_NAME server_group_members
openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 255 --region $REGION_NAME \
server_injected_file_path_bytes; \
openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 100 --region $REGION_NAME \
server_key_pairs; \
openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 10 --region $REGION_NAME \
server_groups; \
openstack --os-cloud devstack-system-admin registered limit create \
--service nova --default-limit 10 --region $REGION_NAME \
server_group_members"
# Tell nova to use these limits # Tell nova to use these limits
iniset $NOVA_CONF quota driver "nova.quota.UnifiedLimitsDriver" iniset $NOVA_CONF quota driver "nova.quota.UnifiedLimitsDriver"
@ -792,13 +783,13 @@ function configure_nova_unified_limits {
iniset $NOVA_CONF oslo_limit username nova iniset $NOVA_CONF oslo_limit username nova
iniset $NOVA_CONF oslo_limit auth_type password iniset $NOVA_CONF oslo_limit auth_type password
iniset $NOVA_CONF oslo_limit auth_url $KEYSTONE_SERVICE_URI iniset $NOVA_CONF oslo_limit auth_url $KEYSTONE_SERVICE_URI
iniset $NOVA_CONF oslo_limit system_scope "'all'" iniset $NOVA_CONF oslo_limit system_scope all
iniset $NOVA_CONF oslo_limit endpoint_id \ iniset $NOVA_CONF oslo_limit endpoint_id \
$(openstack endpoint list --service nova -f value -c ID) $(openstack endpoint list --service nova -f value -c ID)
# Allow the nova service user to read quotas # Allow the nova service user to read quotas
openstack role add --user nova --user-domain Default --system all \ openstack --os-cloud devstack-system-admin role add --user nova \
reader --user-domain $SERVICE_DOMAIN_NAME --system all reader
} }
function init_nova_service_user_conf { function init_nova_service_user_conf {