From f1addfa300b5224d3687ef646e52c19b605bf02a Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Thu, 11 Jun 2020 22:37:44 +0200 Subject: [PATCH] Fix group_vars and cinder template per documentation When installing kolla with external ceph, ceph_cinder_user var has to be set per documentation instead of ceph_cinder_volume_user. This value is also rendered in example etc/kolla/globals.yml file. This patch is fixing this bug or, let's say typo. Change-Id: Id82b07867f4bc0e5d5e56363f0122014df6892bc --- ansible/group_vars/all.yml | 2 +- ansible/roles/cinder/templates/cinder.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 09b0109224..6248e6914c 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -987,7 +987,7 @@ ceph_gnocchi_pool_name: "gnocchi" ceph_nova_pool_name: "vms" ceph_cinder_backup_user: "cinder-backup" -ceph_cinder_volume_user: "cinder" +ceph_cinder_user: "cinder" ceph_glance_user: "glance" ceph_gnocchi_user: "gnocchi" ceph_manila_user: "manila" diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 1c810d810d..a9ea776ce6 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -132,7 +132,7 @@ rbd_flatten_volume_from_snapshot = false rbd_max_clone_depth = 5 rbd_store_chunk_size = 4 rados_connect_timeout = 5 -rbd_user = {{ ceph_cinder_volume_user }} +rbd_user = {{ ceph_cinder_user }} rbd_secret_uuid = {{ cinder_rbd_secret_uuid }} report_discard_supported = True image_upload_use_cinder_backend = True