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

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

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.