openstack
/
openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Add ability to place glance-image-import.conf"

This commit is contained in:
Zuul 2019-05-17 16:24:48 +00:00 committed by Gerrit Code Review
parent a70275c653 2bc76d81a3
commit b6eed437de
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -305,3 +305,6 @@ glance_glance_scheme_json_overrides: {}
glance_glance_swift_store_conf_overrides: {} glance_glance_swift_store_conf_overrides: {}
glance_policy_overrides: {} glance_policy_overrides: {}
glance_api_uwsgi_ini_overrides: {} glance_api_uwsgi_ini_overrides: {}
# Specify path on the local filesystem for glance-image-import.conf
#glance_glance_image_import_conf_location: /path/to/local/glance-image-import.conf

9
tasks/glance_post_install.yml
View File

@ -57,6 +57,15 @@
- Manage LB - Manage LB
- Restart glance services - Restart glance services
- name: Deploy Glance image import configuration file
template:
src: "{{ glance_glance_image_import_conf_location }}"
dest: "{{ glance_etc_dir }}/glance-image-import.conf"
when: glance_glance_image_import_conf_location is defined
notify:
- Manage LB
- Restart glance services
# NOTE(cloudnull): This is using "cp" instead of copy with a remote_source # NOTE(cloudnull): This is using "cp" instead of copy with a remote_source
# because we only want to copy the original files once. and we # because we only want to copy the original files once. and we
# don't want to need multiple tasks. # don't want to need multiple tasks.