Skip to content

Commit 9681041

Browse files
committed
CI: Avoid generating a nova key in ceph-ansible scenario
We use the cinder key for Nova by default, so a separate nova key is no longer used. Change-Id: I49ce6d36747e6c7d3a389d0afd2d034e8afdf8ed (cherry picked from commit 6e18495)
1 parent d41e014 commit 9681041

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

tests/run.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@
354354
- { name: 'cinder/cinder-backup', keyring: "ceph.client.cinder.keyring" }
355355
- { name: 'cinder/cinder-backup', keyring: "ceph.client.cinder-backup.keyring" }
356356
- { name: 'glance', keyring: "ceph.client.glance.keyring" }
357-
- { name: 'nova', keyring: "ceph.client.nova.keyring" }
358357
- { name: 'nova', keyring: "ceph.client.cinder.keyring" }
359358
when: scenario == "ceph-ansible"
360359

tests/templates/ceph-ansible.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ openstack_keys:
2727
- { name: client.glance, caps: { mon: "profile rbd", osd: "profile rbd pool=volumes, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
2828
- { name: client.cinder, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
2929
- { name: client.cinder-backup, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
30-
- { name: client.nova, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_glance_pool.name }}"}, mode: "0600" }
3130
{% endraw %}
3231

3332
# osds

0 commit comments

Comments
 (0)