From 097673afa831fbf94dac28602bb7a8c5800c29d1 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 2 Oct 2020 18:07:01 +0300 Subject: [PATCH] Allow to proceed with role if ceph_conf_file is set We shouldn't stop role execution if ceph_mons is an epty list, since deployer can provide ceph_conf_file and keys instead. Change-Id: I35b23e266aa9c5e29e79ea040994039e47242c9c --- examples/user_variables.yml.ceph-config.example | 7 ------- tasks/main.yml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/examples/user_variables.yml.ceph-config.example b/examples/user_variables.yml.ceph-config.example index 01088a7..5b6ff51 100644 --- a/examples/user_variables.yml.ceph-config.example +++ b/examples/user_variables.yml.ceph-config.example @@ -6,13 +6,6 @@ # Directory containing the Ceph keyring files with access credentials. ceph_keyrings_dir: /etc/openstack_deploy/ceph-keyrings -# List addresses of ceph mons, so they are not used as IPs for containers on -# the storage network. -ceph_mons: - - 172.29.244.18 - - 172.29.244.19 - - 172.29.244.20 - # General Ceph configuration file containing the information for Ceph clients # to connect to the Ceph cluster. ceph_conf_file: | diff --git a/tasks/main.yml b/tasks/main.yml index 9e9711a..8f307b5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,7 +16,7 @@ - name: End playbook if disabled meta: end_play when: - - ceph_mons | list | length == 0 + - ceph_mons | list | length == 0 and ceph_conf_file is not defined tags: - always