From 64b1be0e76b85968e99db3f4d9d88aab65cf92b7 Mon Sep 17 00:00:00 2001 From: Kiran Thyagaraja Date: Mon, 22 Jan 2018 15:29:34 +0000 Subject: [PATCH] Added ceph-client-cinder-keyring secret for RBD backend. --- tasks/backends/rbd.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/tasks/backends/rbd.yml b/tasks/backends/rbd.yml index 0558e3b..2d1868a 100644 --- a/tasks/backends/rbd.yml +++ b/tasks/backends/rbd.yml @@ -9,17 +9,6 @@ src: "/tmp/ceph.conf" register: "ceph_conf" -- name: Generate config files - config_template: - src: rbd/ceph.client.cinder.keyring - dest: /tmp/ceph.client.cinder.keyring - config_type: ini - -- name: Read configs into memory - slurp: - src: "/tmp/ceph.client.cinder.keyring" - register: "ceph_client_cinder_keyring" - - name: Create cinder-volume-rbd configmaps ignore_errors: yes k8s_v1_config_map: @@ -73,9 +62,6 @@ ceph.conf: | {{ceph_conf['content'] | b64decode}} - ceph.client.cinder.keyring: | - {{ceph_client_cinder_keyring['content'] | b64decode}} - - name: Create Cinder Volume Deployment k8s_apps_v1beta1_deployment: @@ -94,6 +80,8 @@ volumeMounts: - name: kolla-config mountPath: /var/lib/kolla/config_files/ + - name: ceph-client-cinder-keyring + mountPath: /etc/ceph/ceph.client.cinder.keyring env: - name: TZ value: UTC @@ -105,4 +93,8 @@ - name: kolla-config config_map: name: cinder-volume-rbd + - name: ceph-client-cinder-keyring + secret: + secretName: ceph-client-cinder-keyring +