From d013500aaed0bd2e97086dc75d1fe24313629fc7 Mon Sep 17 00:00:00 2001
From: Wim Nap <w.k.nap@rug.nl>
Date: Wed, 20 Jun 2018 13:44:16 +0200
Subject: [PATCH] changes in ceph-configs

---
 roles/nova-compute/files/ceph.client.compute.keyring | 0
 roles/nova-compute/files/ceph.client.nova.keyring    | 8 --------
 roles/nova-compute/files/ceph.conf                   | 4 ++--
 roles/nova-compute/tasks/ceph.conf                   | 2 --
 roles/nova-compute/tasks/main.yml                    | 4 ++--
 5 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 roles/nova-compute/files/ceph.client.compute.keyring
 delete mode 100644 roles/nova-compute/files/ceph.client.nova.keyring
 delete mode 100644 roles/nova-compute/tasks/ceph.conf

diff --git a/roles/nova-compute/files/ceph.client.compute.keyring b/roles/nova-compute/files/ceph.client.compute.keyring
new file mode 100644
index 0000000..e69de29
diff --git a/roles/nova-compute/files/ceph.client.nova.keyring b/roles/nova-compute/files/ceph.client.nova.keyring
deleted file mode 100644
index 71e95d6..0000000
--- a/roles/nova-compute/files/ceph.client.nova.keyring
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35383561643837376265356534363538386266646466313034383231313261343566626338613433
-3464373930663738316366383835336235636137356431390a626334343661353733616366633963
-33306166646465356531666364656236633766653639393636396234663538373136373266353136
-3433626231323638300a306437383862316463363533373131343561303934326135663532656630
-38616139373964313963326539346338353664613035633436326433343835343030653936363836
-65313537623937663438663734323265323634376238373761626236353665613931616566306536
-343334346138313539333338336663343863
diff --git a/roles/nova-compute/files/ceph.conf b/roles/nova-compute/files/ceph.conf
index 0d63624..49b88e8 100644
--- a/roles/nova-compute/files/ceph.conf
+++ b/roles/nova-compute/files/ceph.conf
@@ -10,5 +10,5 @@ auth_client_required = cephx
 public network = 172.23.59.0/24
 osd pool default size = 2
 
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring
+[client.compute]
+keyring = /etc/ceph/ceph.client.compute.keyring
diff --git a/roles/nova-compute/tasks/ceph.conf b/roles/nova-compute/tasks/ceph.conf
deleted file mode 100644
index 2e6fecd..0000000
--- a/roles/nova-compute/tasks/ceph.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[client.nova]
-keyring = /etc/ceph/ceph.client.nova.keyring
diff --git a/roles/nova-compute/tasks/main.yml b/roles/nova-compute/tasks/main.yml
index 28aea9e..8f5b600 100644
--- a/roles/nova-compute/tasks/main.yml
+++ b/roles/nova-compute/tasks/main.yml
@@ -33,8 +33,8 @@
 
 - name: copy ceph-client-keyring
   copy:
-    src: files/ceph.client.nova.keyring
-    dest: /srv/nova-compute/etc/ceph/ceph.client.nova.keyring
+    src: files/ceph.client.compute.keyring
+    dest: /srv/nova-compute/etc/ceph/ceph.client.compute.keyring
     mode: 0644
 
 - name: install service file.