Merge "Move glance container bind mount dirs to group_vars"

This commit is contained in:
Jenkins 2017-03-04 17:10:44 +00:00 committed by Gerrit Code Review
commit 69b92aa6ac
2 changed files with 6 additions and 3 deletions

View File

@ -26,3 +26,8 @@ glance_package_state: "{{ package_state }}"
glance_venv_tag: "{{ venv_tag }}"
glance_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"
glance_venv_download_url: "{{ venv_base_download_url }}/glance-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
# glance default list of bind mounts
glance_container_bind_mounts:
- bind_dir_path: "/var/lib/glance/images"
mount_path: "/openstack/{{ inventory_hostname }}"

View File

@ -22,9 +22,7 @@
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
list_of_bind_mounts:
- bind_dir_path: "/var/lib/glance/images"
mount_path: "/openstack/{{ inventory_hostname }}"
list_of_bind_mounts: "{{ glance_container_bind_mounts }}"
when:
- glance_default_store == "file"
- (glance_nfs_client is not defined) or (glance_nfs_client | length == 0)