From 2bc76d81a3ac08fa64ff180c8e6028e262c85c93 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Sun, 12 May 2019 20:51:49 +0300 Subject: [PATCH] Add ability to place glance-image-import.conf New config file glance-image-import.conf was introduced for a while and it provides ability to customize image upload process. As it's optional file, we don't distribute it by default, but only when it's path to config file is set. Change-Id: I437647aff026a460e6e5f8b73827e31631fd8d42 --- defaults/main.yml | 3 +++ tasks/glance_post_install.yml | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index e1bf4358..57c6ae67 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -305,3 +305,6 @@ glance_glance_scheme_json_overrides: {} glance_glance_swift_store_conf_overrides: {} glance_policy_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 \ No newline at end of file diff --git a/tasks/glance_post_install.yml b/tasks/glance_post_install.yml index 91c0cd5c..be0e8307 100644 --- a/tasks/glance_post_install.yml +++ b/tasks/glance_post_install.yml @@ -57,6 +57,15 @@ - Manage LB - 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 # because we only want to copy the original files once. and we # don't want to need multiple tasks.