openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add copy ceph keyring files conditions in cinder"

Browse Source
This commit is contained in:
Jenkins 2017-05-23 11:23:15 +00:00 committed by Gerrit Code Review
commit f1b7366e78
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -526,6 +526,8 @@ octavia_amp_flavor_id:
# must provide separate disks than those for the OSDs # must provide separate disks than those for the OSDs
ceph_enable_cache: "no" ceph_enable_cache: "no"
external_ceph_cephx_enabled: "yes"
# Ceph is not able to determine the size of a cache pool automatically, # Ceph is not able to determine the size of a cache pool automatically,
# so the configuration on the absolute size is required here, otherwise the flush/evict will not work. # so the configuration on the absolute size is required here, otherwise the flush/evict will not work.
ceph_target_max_bytes: "" ceph_target_max_bytes: ""

2
ansible/roles/cinder/tasks/external_ceph.yml
View File

@ -27,6 +27,7 @@
dest: "{{ node_config_directory }}/cinder-volume/" dest: "{{ node_config_directory }}/cinder-volume/"
with_fileglob: with_fileglob:
- "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*" - "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*"
when: external_ceph_cephx_enabled | bool
- name: Copy over Ceph keyring files for cinder-backup - name: Copy over Ceph keyring files for cinder-backup
copy: copy:
@ -34,3 +35,4 @@
dest: "{{ node_config_directory }}/cinder-backup/" dest: "{{ node_config_directory }}/cinder-backup/"
with_fileglob: with_fileglob:
- "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*" - "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*"
when: external_ceph_cephx_enabled | bool

3
etc/kolla/globals.yml
View File

@ -202,6 +202,9 @@ kolla_internal_vip_address: "10.10.10.254"
# must provide separate disks than those for the OSDs # must provide separate disks than those for the OSDs
#ceph_enable_cache: "no" #ceph_enable_cache: "no"
# Set to no if using external Ceph without cephx.
#external_ceph_cephx_enabled: "yes"
# Ceph is not able to determine the size of a cache pool automatically, # Ceph is not able to determine the size of a cache pool automatically,
# so the configuration on the absolute size is required here, otherwise the flush/evict will not work. # so the configuration on the absolute size is required here, otherwise the flush/evict will not work.
#ceph_target_max_bytes: "" #ceph_target_max_bytes: ""