openstack/openstack-ansible
Code Issues Proposed changes

Merge "Set ceph_mons in group_vars"

Browse Source
This commit is contained in:
Jenkins 2017-09-27 05:54:31 +00:00 committed by Gerrit Code Review
commit cf2b5da9d5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group_vars/all/ceph.yml
View File

@ -30,3 +30,9 @@ fetch_directory: /etc/openstack_deploy/ceph-fetch/
# exists. we handle the log dir creation so this is not something we need # exists. we handle the log dir creation so this is not something we need
# ceph-common to prepare for us. # ceph-common to prepare for us.
rbd_client_directories: false rbd_client_directories: false
# The OSA ceph_client role does not support loading IPs from an inventory group,
# so we have to feed it a list of IPs
ceph_mons: "{{ groups[mon_group_name]
| map('extract', hostvars, 'ansible_host')
| list }}"

3
tests/roles/bootstrap-host/tasks/prepare_ceph.yml
View File

@ -54,9 +54,6 @@
content: | content: |
--- ---
devices: {{ ceph_create_loopback.results | map(attribute='stdout') | list | to_yaml | trim }} devices: {{ ceph_create_loopback.results | map(attribute='stdout') | list | to_yaml | trim }}
# The OSA ceph_client role does not support loading IPs from an inventory group,
# so we have to feed it a list of IPs
ceph_mons: "{% raw %}[ {% for host in groups[mon_group_name] %}'{{ hostvars[host]['ansible_host'] }}'{% if not loop.last %},{% endif %}{% endfor %} ]{% endraw %}"
cinder_backends: cinder_backends:
"RBD": "RBD":
volume_driver: cinder.volume.drivers.rbd.RBDDriver volume_driver: cinder.volume.drivers.rbd.RBDDriver