From fc6bae26ac5ca66d01f0a90dc74de48afe59d651 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Tue, 6 Nov 2018 08:49:39 -0800 Subject: [PATCH] Fixup shrink_osd[_container] scenario config ** configuration seems to be for filestore: [ERROR]: [ceph-osd0] Validation failed for variable: lvm_volumes ** Removing `radosgw_interface: eth1` to resolve: The task includes an option with an undefined variable. The error was: 'ansible.vars.hostvars.HostVarsVars object' has no attribute u'ansible_eth1' The error appears to have been in '/home/nwatkins/src/ceph-ansible/roles/ceph-defaults/tasks/set_radosgw_address.yml': line 21, column 5, but may be elsewhere in the file depending on the exact syntax problem. The offending line appears to be: - name: set_fact _radosgw_address to radosgw_interface - ipv4 ^ here Signed-off-by: Noah Watkins (cherry picked from commit 50255b964084ab52d6ca949b50f413c0ad9e2362) --- tests/functional/shrink_osd/container/group_vars/all | 3 --- tests/functional/shrink_osd/container/group_vars/osds | 4 +++- tests/functional/shrink_osd/group_vars/all | 1 - tests/functional/shrink_osd/group_vars/osds | 4 +++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all index bf9696ffd..a4806c26f 100644 --- a/tests/functional/shrink_osd/container/group_vars/all +++ b/tests/functional/shrink_osd/container/group_vars/all @@ -5,13 +5,10 @@ docker: True containerized_deployment: True monitor_interface: eth1 -radosgw_interface: eth1 ceph_mon_docker_subnet: "{{ public_network }}" ceph_docker_on_openstack: False public_network: "192.168.73.0/24" cluster_network: "192.168.74.0/24" -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 ceph_conf_overrides: global: osd_pool_default_size: 1 diff --git a/tests/functional/shrink_osd/container/group_vars/osds b/tests/functional/shrink_osd/container/group_vars/osds index 152d0bd39..7a4bf9276 100644 --- a/tests/functional/shrink_osd/container/group_vars/osds +++ b/tests/functional/shrink_osd/container/group_vars/osds @@ -1,5 +1,7 @@ --- ceph_osd_docker_run_script_path: /var/tmp +journal_size: 100 +osd_objectstore: "filestore" osd_scenario: lvm lvm_volumes: - data: data-lv1 @@ -8,4 +10,4 @@ lvm_volumes: - data: data-lv2 journal: journal1 data_vg: test_group - journal_vg: journals \ No newline at end of file + journal_vg: journals diff --git a/tests/functional/shrink_osd/group_vars/all b/tests/functional/shrink_osd/group_vars/all index 970a90f24..6cd017ce1 100644 --- a/tests/functional/shrink_osd/group_vars/all +++ b/tests/functional/shrink_osd/group_vars/all @@ -3,7 +3,6 @@ ceph_origin: repository ceph_repository: community public_network: "192.168.71.0/24" cluster_network: "192.168.72.0/24" -radosgw_interface: eth1 ceph_conf_overrides: global: osd_pool_default_size: 3 diff --git a/tests/functional/shrink_osd/group_vars/osds b/tests/functional/shrink_osd/group_vars/osds index 04c810dac..d07a317ff 100644 --- a/tests/functional/shrink_osd/group_vars/osds +++ b/tests/functional/shrink_osd/group_vars/osds @@ -2,6 +2,8 @@ os_tuning_params: - { name: fs.file-max, value: 26234859 } osd_scenario: lvm +journal_size: 100 +osd_objectstore: "filestore" lvm_volumes: - data: data-lv1 journal: /dev/sdc1 @@ -9,4 +11,4 @@ lvm_volumes: - data: data-lv2 journal: journal1 data_vg: test_group - journal_vg: journals \ No newline at end of file + journal_vg: journals -- 2.47.3