Skip to content

Commit ddbc44e

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "CI: Avoid generating a nova key in cephadm scenario" into stable/wallaby
2 parents 5fe001a + 6d3ebe1 commit ddbc44e

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

roles/cephadm/defaults/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ cephadm_ceph_users:
2626
- client.glance mon 'profile rbd' osd 'profile rbd pool=images' mgr 'profile rbd pool=images' -o /var/run/ceph/ceph.client.glance.keyring
2727
- 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
2828
- 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
29-
- 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

tests/run.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@
338338
- { name: "cinder/cinder-backup", keyring: "ceph.client.cinder.keyring" }
339339
- { name: "cinder/cinder-backup", keyring: "ceph.client.cinder-backup.keyring" }
340340
- { name: "glance", keyring: "ceph.client.glance.keyring" }
341-
- { name: "nova", keyring: "ceph.client.nova.keyring" }
342341
- { name: "nova", keyring: "ceph.client.cinder.keyring" }
343342
when: scenario == "cephadm"
344343

0 commit comments

Comments
 (0)