openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Make possible to run glance-api not with uwsgi

Browse Source 
While running as uwsgi glance has malfunctioning interoperable image
import feature. So we add new variable `glance_use_uwsgi` based on which
glance will be either started via uwsgi or as a regular service.
Also once glance_use_uwsgi is true, enable_image_import will be disabled

Change-Id: Icf572c656c24b646110ce3fd90727205c22eff15
This commit is contained in:
Dmitriy Rabotyagov 2020-04-08 20:59:57 +03:00 committed by Dmitriy Rabotyagov (noonedeadpunk)
parent 6495419a9f
commit fbe7177e7d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
defaults/main.yml
View File

@ -267,6 +267,10 @@ glance_optional_oslomsg_amqp1_pip_packages:
glance_api_init_overrides: {}
glance_registry_init_overrides: {}
# With enabled uwsgi glance has broken functionality of
# the interoperable import feature (and maybe smth else)
glance_use_uwsgi: True
## Service Names
glance_services:
glance-api:
@ -274,7 +278,8 @@ glance_services:
service_name: glance-api
init_config_overrides: "{{ glance_api_init_overrides }}"
start_order: 1
wsgi_app: True
execstarts: "{{ glance_bin }}/glance-api --config-file /etc/glance/glance.conf"
wsgi_app: "{{ glance_use_uwsgi }}"
wsgi_name: glance-wsgi-api
uwsgi_overrides: "{{ glance_api_uwsgi_ini_overrides }}"
uwsgi_bind_address: "{{ glance_api_bind_address }}"
@ -285,7 +290,7 @@ glance_services:
condition: "{{ glance_enable_v2_registry | bool }}"
init_config_overrides: "{{ glance_registry_init_overrides }}"
start_order: 2
execstarts: "{{ _glance_bin }}/glance-registry"
execstarts: "{{ glance_bin }}/glance-registry"
# Glance uWSGI settings
glance_wsgi_processes_max: 16

1
templates/glance-api.conf.j2
View File

@ -16,6 +16,7 @@ registry_host = {{ glance_registry_host }}
registry_port = {{ glance_registry_service_port }}
registry_client_protocol = {{ glance_service_registry_proto }}
cinder_catalog_info = volume:cinder:internalURL
enable_image_import = {{ not glance_use_uwsgi | bool }}
enable_v2_api = {{ glance_enable_v2_api | bool }}
enable_v2_registry = {{ glance_enable_v2_registry | bool }}