openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Define _glance_available_stores in variables

Browse Source 
Glance available stores is usefull outsie of the template as well, so we
move defining variable from Jinja template only to ansible variables.

Depends-On: https://review.opendev.org/c/openstack/ansible-role-python_venv_build/+/822998
Change-Id: I312fdede3c3bffa0c897588d33fcc5d5d6988ccd
This commit is contained in:
Dmitriy Rabotyagov 2021-12-24 11:23:14 +02:00 committed by James Denton
parent 7a91492c6a
commit 091f33c8da
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/main.yml
View File

@ -139,7 +139,7 @@
openstack_service_venv_bin: "{{ (glance_install_method == 'source') | ternary(glance_bin, '') }}"
when:
- "glance_services['glance-api']['group'] in group_names"
- "'rbd' in ([glance_default_store] + glance_additional_stores)"
- "'rbd' in _glance_available_stores"
tags:
- ceph

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

@ -28,8 +28,7 @@ image_cache_max_size = {{ glance_image_cache_max_size }}
show_image_direct_url = {{ glance_show_image_direct_url }}
show_multiple_locations = {{ glance_show_multiple_locations }}
{% set glance_available_stores = [ glance_default_store ] + glance_additional_stores %}
enabled_backends = {% for backend in glance_available_stores %}{{ ('name' in backend) | ternary(backend['name'], backend) }}:{{ ('type' in backend) | ternary(backend['type'], backend) }}{% if not loop.last %},{% endif %}{% endfor %}
enabled_backends = {% for backend in _glance_available_stores %}{{ ('name' in backend) | ternary(backend['name'], backend) }}:{{ ('type' in backend) | ternary(backend['type'], backend) }}{% if not loop.last %},{% endif %}{% endfor %}
[task]
@ -78,12 +77,12 @@ flavor = {{ glance_flavor }}
[glance_store]
default_backend = {{ glance_default_store }}
{% if 'file' in glance_available_stores %}
{% if 'file' in _glance_available_stores %}
[file]
filesystem_store_datadir = {{ glance_system_user_home }}/{{ glance_nfs_local_directory }}/
{% endif %}
{% if 'swift' in glance_available_stores %}
{% if 'swift' in _glance_available_stores %}
[swift]
swift_store_config_file = {{ glance_etc_dir }}/glance-swift-store.conf
default_swift_reference = swift1
@ -97,7 +96,7 @@ swift_store_retry_get_count = 5
swift_store_endpoint_type = {{ glance_swift_store_endpoint_type }}
{% endif %}
{% if 'rbd' in glance_available_stores %}
{% if 'rbd' in _glance_available_stores %}
[rbd]
rbd_store_pool = {{ glance_rbd_store_pool }}
rbd_store_user = {{ glance_rbd_store_user }}

1
vars/main.yml
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
_glance_available_stores: "{{ [ glance_default_store ] + glance_additional_stores }}"
_glance_is_first_play_host: "{{ (glance_services['glance-api']['group'] in group_names and inventory_hostname == (groups[glance_services['glance-api']['group']] | intersect(ansible_play_hosts)) | first) | bool }}"
#