From: Dimitri Savineau Date: Tue, 9 Jun 2020 19:19:57 +0000 (-0400) Subject: ceph-osd: remove ceph-osd-run.sh script X-Git-Tag: v5.0.1~42 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=51cfb89501505e1a765615a8d1bab4b5dc69f925;p=ceph-ansible.git ceph-osd: remove ceph-osd-run.sh script Since we only have one scenario since nautilus then we can just move the container start command from ceph-osd-run.sh to the systemd unit service. As a result, the ceph-osd-run.sh.j2 template and the ceph_osd_docker_run_script_path variable are removed. Signed-off-by: Dimitri Savineau (cherry picked from commit 829990e60d8569198e3fc849624131a7cf6ddf84) --- diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample index 780e044ed..e8620a860 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -190,7 +190,6 @@ dummy: # ACTIVATE DEVICE # #ceph_osd_docker_extra_env: -#ceph_osd_docker_run_script_path: "/usr/share" # script called by systemd to run the docker command #ceph_osd_numactl_opts: "" ########### diff --git a/infrastructure-playbooks/purge-container-cluster.yml b/infrastructure-playbooks/purge-container-cluster.yml index bcdbecea9..bf56df2cf 100644 --- a/infrastructure-playbooks/purge-container-cluster.yml +++ b/infrastructure-playbooks/purge-container-cluster.yml @@ -323,18 +323,6 @@ - "{{ playbook_dir }}/group_vars/osds.yml" skip: true - - name: find all osd_disk_prepare logs - find: - paths: "{{ ceph_osd_docker_run_script_path | default('/usr/share') }}" - pattern: "ceph-osd-prepare-*.log" - register: osd_disk_prepare_logs - - - name: ensure all osd_disk_prepare logs are removed - file: - path: "{{ item.path }}" - state: absent - with_items: "{{ osd_disk_prepare_logs.files }}" - - name: purge ceph mon cluster hosts: "{{ mon_group_name|default('mons') }}" diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml index 4cf563f35..a5cf3a312 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -182,7 +182,6 @@ ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} # ACTIVATE DEVICE # ceph_osd_docker_extra_env: -ceph_osd_docker_run_script_path: "/usr/share" # script called by systemd to run the docker command ceph_osd_numactl_opts: "" ########### diff --git a/roles/ceph-osd/tasks/systemd.yml b/roles/ceph-osd/tasks/systemd.yml index 4992e5ee4..367d49ec3 100644 --- a/roles/ceph-osd/tasks/systemd.yml +++ b/roles/ceph-osd/tasks/systemd.yml @@ -1,17 +1,5 @@ --- -- name: generate ceph osd docker run script - become: true - template: - src: "{{ role_path }}/templates/ceph-osd-run.sh.j2" - dest: "{{ ceph_osd_docker_run_script_path }}/ceph-osd-run.sh" - owner: "root" - group: "root" - mode: "0744" - setype: "bin_t" - notify: restart ceph osds - - name: generate systemd unit file - become: true template: src: "{{ role_path }}/templates/ceph-osd.service.j2" dest: /etc/systemd/system/ceph-osd@.service diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 deleted file mode 100644 index 06eeaa2de..000000000 --- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# {{ ansible_managed }} - - -######## -# MAIN # -######## -{% set cpu_limit = ansible_processor_vcpus|int if ceph_osd_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_osd_docker_cpu_limit|int %} - -{% if ceph_osd_numactl_opts != "" %} -numactl \ -{{ ceph_osd_numactl_opts }} \ -{% endif %} -/usr/bin/{{ container_binary }} run \ - --rm \ - --net=host \ - --privileged=true \ - --pid=host \ - --ipc=host \ - {% if osd_objectstore == 'filestore' -%} - --memory={{ ceph_osd_docker_memory_limit }} \ - {% endif -%} - --cpus={{ cpu_limit }} \ - {% if ceph_osd_docker_cpuset_cpus is defined -%} - --cpuset-cpus='{{ ceph_osd_docker_cpuset_cpus }}' \ - {% endif -%} - {% if ceph_osd_docker_cpuset_mems is defined -%} - --cpuset-mems='{{ ceph_osd_docker_cpuset_mems }}' \ - {% endif -%} - -v /dev:/dev \ - -v /etc/localtime:/etc/localtime:ro \ - -v /var/lib/ceph:/var/lib/ceph:z \ - -v /etc/ceph:/etc/ceph:z \ - -v /var/run/ceph:/var/run/ceph:z \ - -v /var/run/udev/:/var/run/udev/ \ - -v /var/log/ceph:/var/log/ceph:z \ - {% if ansible_distribution == 'Ubuntu' -%} - --security-opt apparmor:unconfined \ - {% endif -%} - {{ container_env_args }} \ - -e CLUSTER={{ cluster }} \ - {% if (ceph_tcmalloc_max_total_thread_cache | int) > 0 and osd_objectstore == 'filestore' -%} - -e TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES={{ ceph_tcmalloc_max_total_thread_cache }} \ - {% endif -%} - -v /run/lvm/:/run/lvm/ \ - -e CEPH_DAEMON=OSD_CEPH_VOLUME_ACTIVATE \ - -e CONTAINER_IMAGE={{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \ - -e OSD_ID="$1" \ - --name=ceph-osd-"$1" \ - {{ ceph_osd_docker_extra_env }} \ - {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2 index 088903234..b49a98e1a 100644 --- a/roles/ceph-osd/templates/ceph-osd.service.j2 +++ b/roles/ceph-osd/templates/ceph-osd.service.j2 @@ -7,12 +7,54 @@ Requires=docker.service {% else %} After=network.target {% endif %} +{% set cpu_limit = ansible_processor_vcpus|int if ceph_osd_docker_cpu_limit|int > ansible_processor_vcpus|int else ceph_osd_docker_cpu_limit|int %} [Service] EnvironmentFile=-/etc/environment ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-osd-%i ExecStartPre=-/usr/bin/{{ container_binary }} rm -f ceph-osd-%i -ExecStart={{ ceph_osd_docker_run_script_path }}/ceph-osd-run.sh %i +ExecStart={% if ceph_osd_numactl_opts != "" %} +numactl \ +{{ ceph_osd_numactl_opts }} \ +{% endif %} +/usr/bin/{{ container_binary }} run \ + --rm \ + --net=host \ + --privileged=true \ + --pid=host \ + --ipc=host \ + {% if osd_objectstore == 'filestore' -%} + --memory={{ ceph_osd_docker_memory_limit }} \ + {% endif -%} + --cpus={{ cpu_limit }} \ + {% if ceph_osd_docker_cpuset_cpus is defined -%} + --cpuset-cpus='{{ ceph_osd_docker_cpuset_cpus }}' \ + {% endif -%} + {% if ceph_osd_docker_cpuset_mems is defined -%} + --cpuset-mems='{{ ceph_osd_docker_cpuset_mems }}' \ + {% endif -%} + -v /dev:/dev \ + -v /etc/localtime:/etc/localtime:ro \ + -v /var/lib/ceph:/var/lib/ceph:z \ + -v /etc/ceph:/etc/ceph:z \ + -v /var/run/ceph:/var/run/ceph:z \ + -v /var/run/udev/:/var/run/udev/ \ + -v /var/log/ceph:/var/log/ceph:z \ + {% if ansible_distribution == 'Ubuntu' -%} + --security-opt apparmor:unconfined \ + {% endif -%} + {{ container_env_args }} \ + -e CLUSTER={{ cluster }} \ + {% if (ceph_tcmalloc_max_total_thread_cache | int) > 0 and osd_objectstore == 'filestore' -%} + -e TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES={{ ceph_tcmalloc_max_total_thread_cache }} \ + {% endif -%} + -v /run/lvm/:/run/lvm/ \ + -e CEPH_DAEMON=OSD_CEPH_VOLUME_ACTIVATE \ + -e CONTAINER_IMAGE={{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \ + -e OSD_ID=%i \ + --name=ceph-osd-%i \ + {{ ceph_osd_docker_extra_env }} \ + {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} ExecStop=-/usr/bin/{{ container_binary }} stop ceph-osd-%i KillMode=none Restart=always diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all index b0fa6ff89..f8c227c46 100644 --- a/tests/functional/add-mdss/container/group_vars/all +++ b/tests/functional/add-mdss/container/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all index 92a7247da..c26159e34 100644 --- a/tests/functional/add-mgrs/container/group_vars/all +++ b/tests/functional/add-mgrs/container/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all index 576156ac2..b84e51a96 100644 --- a/tests/functional/add-mons/container/group_vars/all +++ b/tests/functional/add-mons/container/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index 80d464a7b..0949f6224 100644 --- a/tests/functional/add-osds/container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all index b0b393948..3e16a7749 100644 --- a/tests/functional/add-rbdmirrors/container/group_vars/all +++ b/tests/functional/add-rbdmirrors/container/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all index 5c1fc51ea..6f49b6836 100644 --- a/tests/functional/add-rgws/container/group_vars/all +++ b/tests/functional/add-rgws/container/group_vars/all @@ -26,7 +26,6 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp rgw_override_bucket_index_max_shards: 16 rgw_bucket_default_quota_max_objects: 1638400 dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all index c7a094469..d9859aa5b 100644 --- a/tests/functional/all-in-one/container/group_vars/all +++ b/tests/functional/all-in-one/container/group_vars/all @@ -35,7 +35,6 @@ rgw_create_pools: ec_profile: myecprofile ec_k: 2 ec_m: 1 -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all index ee5c11939..71efbc415 100644 --- a/tests/functional/all-in-one/group_vars/all +++ b/tests/functional/all-in-one/group_vars/all @@ -20,7 +20,6 @@ ceph_conf_overrides: osd_pool_default_size: 1 handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/all_daemons/container/group_vars/osds b/tests/functional/all_daemons/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/all_daemons/container/group_vars/osds +++ b/tests/functional/all_daemons/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/collocation/container/group_vars/osds b/tests/functional/collocation/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/collocation/container/group_vars/osds +++ b/tests/functional/collocation/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/collocation/group_vars/osds b/tests/functional/collocation/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/collocation/group_vars/osds +++ b/tests/functional/collocation/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/docker2podman/group_vars/osds b/tests/functional/docker2podman/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/docker2podman/group_vars/osds +++ b/tests/functional/docker2podman/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all index 7908d1d14..ccb69f700 100644 --- a/tests/functional/external_clients/container/inventory/group_vars/all +++ b/tests/functional/external_clients/container/inventory/group_vars/all @@ -28,7 +28,6 @@ rgw_create_pools: pg_num: 16 bar: pg_num: 16 -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/external_clients/inventory/group_vars/all b/tests/functional/external_clients/inventory/group_vars/all index c0cbb6b6b..3569d71df 100644 --- a/tests/functional/external_clients/inventory/group_vars/all +++ b/tests/functional/external_clients/inventory/group_vars/all @@ -20,7 +20,6 @@ ceph_conf_overrides: osd_pool_default_size: 1 handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/filestore-to-bluestore/container/group_vars/all b/tests/functional/filestore-to-bluestore/container/group_vars/all index 84e21497b..4c8294afd 100644 --- a/tests/functional/filestore-to-bluestore/container/group_vars/all +++ b/tests/functional/filestore-to-bluestore/container/group_vars/all @@ -20,7 +20,6 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all index 91c09b7b6..9f3a0f888 100644 --- a/tests/functional/lvm-auto-discovery/container/group_vars/all +++ b/tests/functional/lvm-auto-discovery/container/group_vars/all @@ -24,7 +24,6 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 \ No newline at end of file diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all index d136d847d..2fb0f924d 100644 --- a/tests/functional/lvm-batch/container/group_vars/all +++ b/tests/functional/lvm-batch/container/group_vars/all @@ -26,7 +26,6 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 03aaff786..3ea93c233 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -20,7 +20,6 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False handler_health_mon_check_delay: 10 handler_health_osd_check_delay: 10 \ No newline at end of file diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts index 4eba29163..6a27be6f1 100644 --- a/tests/functional/ooo-collocation/hosts +++ b/tests/functional/ooo-collocation/hosts @@ -64,7 +64,6 @@ all: - {name: backups, pg_num: 8, rule_name: 'replicated_rule'} - {name: vms, pg_num: 8, rule_name: 'replicated_rule'} - {name: volumes, pg_num: 8, rule_name: 'replicated_rule'} - ceph_osd_docker_run_script_path: /opt pools: [] public_network: 192.168.95.0/24 radosgw_address_block: 192.168.95.0/24 diff --git a/tests/functional/podman/group_vars/osds b/tests/functional/podman/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/podman/group_vars/osds +++ b/tests/functional/podman/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all index 52f89d330..752f68c24 100644 --- a/tests/functional/rgw-multisite/container/group_vars/all +++ b/tests/functional/rgw-multisite/container/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all index 594073746..fa8612d14 100644 --- a/tests/functional/rgw-multisite/container/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all @@ -26,5 +26,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/rgw-multisite/secondary/group_vars/all b/tests/functional/rgw-multisite/secondary/group_vars/all index 70112b26d..1329c28ba 100644 --- a/tests/functional/rgw-multisite/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/secondary/group_vars/all @@ -24,5 +24,4 @@ ceph_conf_overrides: mon_allow_pool_size_one: true mon_warn_on_pool_no_redundancy: false osd_pool_default_size: 1 -ceph_osd_docker_run_script_path: /var/tmp dashboard_enabled: False \ No newline at end of file diff --git a/tests/functional/shrink_mds/container/group_vars/osds b/tests/functional/shrink_mds/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/shrink_mds/container/group_vars/osds +++ b/tests/functional/shrink_mds/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/shrink_mgr/container/group_vars/osds b/tests/functional/shrink_mgr/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/shrink_mgr/container/group_vars/osds +++ b/tests/functional/shrink_mgr/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/shrink_mon/container/group_vars/osds b/tests/functional/shrink_mon/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/shrink_mon/container/group_vars/osds +++ b/tests/functional/shrink_mon/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/shrink_osd/container/group_vars/osds b/tests/functional/shrink_osd/container/group_vars/osds index 2558deb1b..c9149bd50 100644 --- a/tests/functional/shrink_osd/container/group_vars/osds +++ b/tests/functional/shrink_osd/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp journal_size: 100 osd_objectstore: "filestore" lvm_volumes: diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/osds b/tests/functional/shrink_rbdmirror/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/shrink_rbdmirror/container/group_vars/osds +++ b/tests/functional/shrink_rbdmirror/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1 diff --git a/tests/functional/shrink_rgw/container/group_vars/osds b/tests/functional/shrink_rgw/container/group_vars/osds index 9cea91d6a..27268d406 100644 --- a/tests/functional/shrink_rgw/container/group_vars/osds +++ b/tests/functional/shrink_rgw/container/group_vars/osds @@ -1,5 +1,4 @@ --- -ceph_osd_docker_run_script_path: /var/tmp osd_objectstore: "bluestore" lvm_volumes: - data: data-lv1