]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: don't install s3cmd on containerized setup
authorDimitri Savineau <dsavinea@redhat.com>
Fri, 7 Feb 2020 20:58:17 +0000 (15:58 -0500)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 17 Feb 2020 10:27:52 +0000 (11:27 +0100)
The s3cmd package should only be installed on non containerized
deployment.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
tests/functional/rgw_multisite.yml

index 984501a5ac61d099d05c67e071517cfb9200f101..02f1210b042943eb63f2b290d6fcd4987f911888 100644 (file)
@@ -5,23 +5,13 @@
   vars:
     s3cmd_cmd: "s3cmd --no-ssl --access_key={{ system_access_key }} --secret_key={{ system_secret_key }} --host={{ rgw_multisite_endpoint_addr }}:8080 --host-bucket={{ rgw_multisite_endpoint_addr }}:8080"
   tasks:
-
-    - name: check if it is Atomic host
-      stat: path=/run/ostree-booted
-      register: stat_ostree
-      check_mode: no
-
-    - name: set fact for using Atomic host
-      set_fact:
-        is_atomic: '{{ stat_ostree.stat.exists }}'
-
     - name: install s3cmd
       package:
         name: s3cmd
         state: present
       register: result
       until: result is succeeded
-      when: not is_atomic | bool
+      when: not containerized_deployment | default(false) | bool
 
     - name: generate and upload a random 10Mb file - containerized deployment
       command: >