From 6f020a048344c5a9e659193fff052b9b8c578810 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 5 Dec 2018 11:59:42 +0800
Subject: [PATCH] Fix glance configuration when using external ceph
When using external ceph, enable_ceph=no and glance_backend_ceph=yes,
glance.conf should enable rbd store.
Change-Id: Ia09cd57c829b00f28674cddf44fb55583e193d0f
---
ansible/roles/glance/defaults/main.yml | 2 +-
ansible/roles/glance/templates/glance-api.conf.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index 8f1764a43f..30f0b08b41 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -126,7 +126,7 @@ glance_backends:
- name: http
enabled: true
- name: "rbd"
- enabled: "{{ enable_ceph | bool and glance_backend_ceph | bool }}"
+ enabled: "{{ glance_backend_ceph | bool }}"
- name: "vmware"
enabled: "{{ glance_backend_vmware | bool }}"
- name: cinder
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index 5608c39106..cb2df446ed 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -56,7 +56,7 @@ filesystem_store_datadir = /var/lib/glance/images/
stores = {{ glance_store_backends|map(attribute='name')|join(',') }}
{% endif %}
-{% if enable_ceph | bool and glance_backend_ceph | bool %}
+{% if glance_backend_ceph | bool %}
rbd_store_user = glance
rbd_store_pool = {{ ceph_glance_pool_name }}
rbd_store_chunk_size = 8