From 6e18495892a9fbe0431764cbd18f7a2e902d8746 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 30 Jun 2021 09:25:44 +0100
Subject: [PATCH] CI: Avoid generating a nova key in cephadm scenario
We use the cinder key for Nova by default, so a separate nova key is no
longer used.
Change-Id: I49ce6d36747e6c7d3a389d0afd2d034e8afdf8ed
---
roles/cephadm/defaults/main.yml | 1 -
tests/run.yml | 1 -
2 files changed, 2 deletions(-)
diff --git a/roles/cephadm/defaults/main.yml b/roles/cephadm/defaults/main.yml
index abae1377be..ef2ceaed97 100644
--- a/roles/cephadm/defaults/main.yml
+++ b/roles/cephadm/defaults/main.yml
@@ -26,4 +26,3 @@ cephadm_ceph_users:
- client.glance mon 'profile rbd' osd 'profile rbd pool=images' mgr 'profile rbd pool=images' -o /var/run/ceph/ceph.client.glance.keyring
- client.cinder mon 'profile rbd' osd 'profile rbd pool=volumes, profile rbd pool=vms, profile rbd-read-only pool=images' mgr 'profile rbd pool=volumes, profile rbd pool=vms' -o /var/run/ceph/ceph.client.cinder.keyring
- client.cinder-backup mon 'profile rbd' osd 'profile rbd pool=backups' mgr 'profile rbd pool=backups' -o /var/run/ceph/ceph.client.cinder-backup.keyring
- - client.nova mon 'profile rbd' osd 'profile rbd pool=volumes, profile rbd pool=vms, profile rbd-read-only pool=images' mgr 'profile rbd pool=volumes, profile rbd pool=vms' -o /var/run/ceph/ceph.client.nova.keyring
diff --git a/tests/run.yml b/tests/run.yml
index 5b40978bec..7f3c953291 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -338,7 +338,6 @@
- { name: "cinder/cinder-backup", keyring: "ceph.client.cinder.keyring" }
- { name: "cinder/cinder-backup", keyring: "ceph.client.cinder-backup.keyring" }
- { name: "glance", keyring: "ceph.client.glance.keyring" }
- - { name: "nova", keyring: "ceph.client.nova.keyring" }
- { name: "nova", keyring: "ceph.client.cinder.keyring" }
when: scenario == "cephadm"