From 3a67e5727be91c278f59b52a2316700c0b9cd5b0 Mon Sep 17 00:00:00 2001 From: shaofeng_cheng Date: Thu, 20 Apr 2017 15:29:00 +0800 Subject: [PATCH] Add copy ceph keyring files conditions in cinder If used external ceph for cinder,the ceph storage not enable cephx. So ceph keyring file not does not exist. Task throw warning of copy over ceph keyring files. Change-Id: Ibb3cd536c982ad9dede3c2a0ecfc02cdf6e4c1b9 Closes-Bug: #1684461 --- ansible/group_vars/all.yml | 2 ++ ansible/roles/cinder/tasks/external_ceph.yml | 2 ++ etc/kolla/globals.yml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index b1c28b93c3..8ab39156b1 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -526,6 +526,8 @@ octavia_amp_flavor_id: # must provide separate disks than those for the OSDs ceph_enable_cache: "no" +external_ceph_cephx_enabled: "yes" + # 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. ceph_target_max_bytes: "" diff --git a/ansible/roles/cinder/tasks/external_ceph.yml b/ansible/roles/cinder/tasks/external_ceph.yml index 45fe480ee5..25b522cb63 100644 --- a/ansible/roles/cinder/tasks/external_ceph.yml +++ b/ansible/roles/cinder/tasks/external_ceph.yml @@ -27,6 +27,7 @@ dest: "{{ node_config_directory }}/cinder-volume/" with_fileglob: - "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*" + when: external_ceph_cephx_enabled | bool - name: Copy over Ceph keyring files for cinder-backup copy: @@ -34,3 +35,4 @@ dest: "{{ node_config_directory }}/cinder-backup/" with_fileglob: - "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*" + when: external_ceph_cephx_enabled | bool diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index dcd969c83f..6352e3c874 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -202,6 +202,9 @@ kolla_internal_vip_address: "10.10.10.254" # must provide separate disks than those for the OSDs #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, # so the configuration on the absolute size is required here, otherwise the flush/evict will not work. #ceph_target_max_bytes: ""