Merge "Turn the filesystem directory to be configurable"
This commit is contained in:
commit
b1e8e2337a
@ -207,7 +207,7 @@ glance_policy_dirs: policy.d
|
||||
# Define nfs information to enable nfs shares as mounted directories for
|
||||
# glance. The ``glance_nfs_client`` value is a list of dictionaries that must
|
||||
# be filled out completely to enable the persistent NFS mounts.
|
||||
|
||||
glance_nfs_local_directory: "images"
|
||||
glance_nfs_client: []
|
||||
|
||||
# Example of the expected dict structure:
|
||||
|
@ -50,6 +50,8 @@
|
||||
owner: "{{ glance_system_user_name }}"
|
||||
group: "{{ glance_system_group_name }}"
|
||||
mode: "0755"
|
||||
owner: "{{ item.owner | default(glance_system_user_name) }}"
|
||||
group: "{{ item.group | default(glance_system_group_name) }}"
|
||||
with_items: "{{ glance_nfs_client }}"
|
||||
|
||||
# NOTE(cloudnull): During an upgrade the local directory may exist on a source
|
||||
@ -111,7 +113,7 @@
|
||||
mode: "0700"
|
||||
- path: "{{ glance_system_user_home }}/cache/registry"
|
||||
- path: "{{ glance_system_user_home }}/scrubber"
|
||||
- path: "{{ glance_system_user_home }}/images"
|
||||
- path: "{{ glance_system_user_home }}/{{ glance_nfs_local_directory }}"
|
||||
mode: "0755"
|
||||
|
||||
- name: Install distro packages
|
||||
|
@ -84,7 +84,7 @@ default_store = {{ glance_default_store }}
|
||||
stores = {% for backend in glance_available_stores %}{{ backend }}{% if not loop.last %},{% endif %}{% endfor %}
|
||||
|
||||
{% if 'file' in glance_available_stores %}
|
||||
filesystem_store_datadir = {{ glance_system_user_home }}/images/
|
||||
filesystem_store_datadir = {{ glance_system_user_home }}/{{ glance_nfs_local_directory }}/
|
||||
{% endif %}
|
||||
|
||||
{% if 'swift' in glance_available_stores %}
|
||||
|
Loading…
x
Reference in New Issue
Block a user