From 6ac759f10d7bf14702406c5f8710f7ee757040ac Mon Sep 17 00:00:00 2001 From: Kiran Thyagaraja Date: Sat, 20 Jan 2018 20:06:58 +0000 Subject: [PATCH] Added and fixed jinja template stuff in ceph backend --- tasks/hiera.yml | 1 + templates/rbd/ceph.client.cinder.keyring | 0 templates/rbd/ceph.conf.j2 | 10 +++++----- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 templates/rbd/ceph.client.cinder.keyring diff --git a/tasks/hiera.yml b/tasks/hiera.yml index ae03c63..3558c27 100644 --- a/tasks/hiera.yml +++ b/tasks/hiera.yml @@ -47,6 +47,7 @@ tripleo::profile::base::ceph::ceph_mon_host: ceph_mon_host ceph::profile::params::fsid: ceph_cluster_fsid + ceph::profile::params::authentication_type: authentication_type default: '{{cinder_config}}' fact_variable: 'cinder_config' diff --git a/templates/rbd/ceph.client.cinder.keyring b/templates/rbd/ceph.client.cinder.keyring new file mode 100644 index 0000000..e69de29 diff --git a/templates/rbd/ceph.conf.j2 b/templates/rbd/ceph.conf.j2 index b54c2b2..8b761a5 100644 --- a/templates/rbd/ceph.conf.j2 +++ b/templates/rbd/ceph.conf.j2 @@ -1,10 +1,10 @@ [global] fsid = {{result.conf_dict['ceph_cluster_fsid']}} -mon_host = {{result.conf_dict['ceph_mon_host']} -auth_cluster_required = cephx -auth_service_required = cephx -auth_client_required = cephx -auth_supported = cephx +mon_host = {{result.conf_dict['ceph_mon_host']}} +auth_cluster_required = {{result.conf_dict['authentication_type']}} +auth_service_required = {{result.conf_dict['authentication_type']}} +auth_client_required = {{result.conf_dict['authentication_type']}} +auth_supported = {{result.conf_dict['authentication_type']}} [client] rbd_default_features = 1