From 5f91818e75b1cf9462059216846fdc73b9a8922c Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 13 Jul 2022 23:39:42 +0200 Subject: [PATCH] Do not override CephClientConfigVars in standalone scenarios I7717f2ce9f668e9fd77c9b49e2433d729ed3c836 will ensure CephClientConfigVars is set for deployed ceph standalone scenarios. Change-Id: I6fe456fe153d10a9958230bd7dcc6f25e350da53 (cherry picked from commit 4f791902ae7296e1ad5ca81b4b76c2078cd8beae) --- ci/environments/scenario001-standalone.yaml | 1 - ci/environments/scenario004-standalone.yaml | 1 - ci/environments/scenario010-standalone.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 0d828cd983..faa3691563 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -188,7 +188,6 @@ parameter_defaults: globalkey: globalvalue osd: osdkey: osdvalue - foo: bar mon: mon_warn_on_pool_no_redundancy: false mon_warn_on_insecure_global_id_reclaim_allowed: false diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 1d6ac65147..fabae96593 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -87,4 +87,3 @@ parameter_defaults: ManilaCephFSCephFSProtocolHelperType: 'NFS' DisableCephadm: true CephConfigPath: "/etc/ceph" - CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml" diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml index 30835e814f..43388581e9 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -68,4 +68,3 @@ parameter_defaults: - tty6 ContainerCli: podman CephConfigPath: "/etc/ceph" - CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml"