Skip to content

Commit 45468f7

Browse files
Merge pull request #1036 from katarimanojk/support_adoption_with_external_ceph
support ext ceph in ceph_backend_configuration
2 parents 4f86f56 + 07424da commit 45468f7

File tree

1 file changed

+4
-2
lines changed
  • tests/roles/ceph_backend_configuration/tasks

1 file changed

+4
-2
lines changed

tests/roles/ceph_backend_configuration/tasks/main.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
no_log: "{{ use_no_log }}"
33
ansible.builtin.set_fact:
44
ceph_backend_configuration_shell_vars: |
5-
CEPH_SSH="{{ controller1_ssh }}"
5+
# if tripleo uses external ceph, ssh to ceph nodes otherwise controller nodes
6+
# for external ceph, external_ceph and ceph1_ssh vars should be defined
7+
CEPH_SSH="{{ external_ceph | default(false) | ternary(ceph1_ssh, controller1_ssh) }}"
68
CEPH_KEY=$($CEPH_SSH "cat /etc/ceph/ceph.client.openstack.keyring | base64 -w 0")
79
CEPH_CONF=$($CEPH_SSH "cat /etc/ceph/ceph.conf | base64 -w 0")
810
@@ -11,7 +13,7 @@
1113
ansible.builtin.shell: |
1214
{{ shell_header }}
1315
{{ oc_header }}
14-
CEPH_SSH="{{ controller1_ssh }}"
16+
CEPH_SSH="{{ external_ceph | default(false) | ternary(ceph1_ssh, controller1_ssh) }}"
1517
CEPH_CAPS="mgr 'allow *' mon 'allow r, profile rbd' osd 'profile rbd pool=vms, profile rbd pool=volumes, profile rbd pool=images, profile rbd pool=backups, allow rw pool manila_data'"
1618
OSP_KEYRING="client.openstack"
1719
CEPH_ADM=$($CEPH_SSH "cephadm shell -- ceph auth caps $OSP_KEYRING $CEPH_CAPS")

0 commit comments

Comments
 (0)