Merge "Update thread/worker settings for optimal memory usage"

tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2

@@ -33,20 +33,17 @@ neutron_metadata_checksum_fix: True
 ceilometer_api_workers: 2
 ceilometer_notification_workers: 2
 cinder_osapi_volume_workers: 2
-glance_api_workers: 2
-glance_registry_workers: 2
-heat_api_workers: 2
-heat_engine_workers: 2
+glance_api_threads: 2
+heat_api_threads: 2
 horizon_wsgi_processes: 2
 horizon_wsgi_threads: 2
 keystone_wsgi_processes: 2
 neutron_api_workers: 2
 neutron_metadata_workers: 1
 neutron_rpc_workers: 1
-nova_conductor_workers: 2
-nova_metadata_workers: 2
-nova_osapi_compute_workers: 2
+nova_api_threads: 2
 nova_wsgi_processes: 2
+repo_nginx_threads: 2
 swift_account_server_workers: 2
 swift_container_server_workers: 2
 swift_object_server_workers: 2