From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 27 Feb 2019 10:35:34 +0000 (+0100)
Subject: tests: set ceph_origin and ceph_repository for non_container-collocation
X-Git-Tag: v4.0.0rc1~76
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4ab02d2cd1e200ad85d11e170ec681da98206dd4;p=ceph-ansible.git

tests: set ceph_origin and ceph_repository for non_container-collocation

those variables are mandatory.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index e4855eacb..85b169f44 100644
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -46,8 +46,7 @@
       CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
       CEPH_CONTAINER_BINARY: "{{ container_binary }}"
     with_items:
-      - "{{ groups.get(mgr_group_name, []) }}" # this honors the condition where mgrs run on separate machines
-      - "{{ groups.get(mon_group_name, []) if groups.get(mgr_group_name, []) | length == 0 else [] }}" # this honors the new rule where mgrs are always collocated with mons
+      - "{{ groups.get(mon_group_name) if groups.get(mgr_group_name, []) | length == 0 else groups.get(mgr_group_name, []) }}"
     run_once: True
     delegate_to: "{{ groups[mon_group_name][0] }}"
 
@@ -57,8 +56,7 @@
       dest: "{{ fetch_directory }}/{{ fsid }}/{{ ceph_conf_key_directory }}/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring"
       flat: yes
     with_items:
-      - "{{ groups.get(mgr_group_name, []) }}" # this honors the condition where mgrs run on separate machines
-      - "{{ groups.get(mon_group_name, []) if groups.get(mgr_group_name, []) | length == 0 else [] }}" # this honors the new rule where mgrs are always collocated with mons
+      - "{{ groups.get(mon_group_name) if groups.get(mgr_group_name, []) | length == 0 else groups.get(mgr_group_name, []) }}"
     delegate_to: "{{ groups[mon_group_name][0] }}"
   when:
     - cephx
diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 0df7c7a6e..f2fd8fcdc 100644
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -1,5 +1,7 @@
 ---
 containerized_deployment: False
+ceph_origin: repository
+ceph_repository: community
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"