Merge "test_deps: Let test_deps use ceph repo"

tripleo_ansible/roles/test_deps/defaults/main.yml

@@ -20,3 +20,4 @@ test_deps_setup_tripleo: false
 test_deps_repo_version: "{{ ansible_facts['distribution'] | lower }}{{ ansible_facts['distribution_major_version'] }}-master"
 test_deps_mirrors_file_path: /etc/ci/mirror_info.sh
 test_deps_setup_stream: true
+test_deps_setup_ceph: false

tripleo_ansible/roles/test_deps/tasks/main.yml

@@ -71,7 +71,8 @@
     - test_deps_setup_tripleo | bool
   block:
     - name: Create tripleo repos
-      command: tripleo-repos {{ test_deps_setup_stream | ternary('--stream', '--no-stream', omit) }} -b master current-tripleo
+      command: tripleo-repos {{ test_deps_setup_stream | ternary('--stream', '--no-stream', omit) }} \
+          -b master current-tripleo {{ test_deps_setup_ceph | ternary('ceph', '', omit) }}
 
     - name: Install tripleo packages
       package:

tripleo_ansible/roles/tripleo_cephadm/molecule/default/prepare.yml

@@ -19,14 +19,12 @@
   hosts: all
   roles:
     - role: test_deps
+      test_deps_setup_tripleo: true
+      test_deps_setup_stream: false
+      test_deps_setup_ceph: true
+      test_deps_extra_packages:
+        - openssh
   tasks:
-    - name: Install additional dependencies
-      package:
-        name: openssh
-        state: present
-    - name: Enable ceph repsitory
-      command: tripleo-repos --no-stream -b master current-tripleo ceph
-      become: true
     - name: Ensure ceph-admin group exists
       group:
         name: ceph-admin

tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml

@@ -17,22 +17,14 @@
 
 - name: Prepare
   hosts: all
-  vars:
-    test_deps_setup_stream: false
-    required_packages:
-      - facter
-      - rsync
   roles:
     - role: test_deps
+      test_deps_setup_tripleo: true
+      test_deps_setup_stream: false
+      test_deps_extra_packages:
+        - facter
+        - rsync
   post_tasks:
-    - name: Create tripleo repos
-      command: tripleo-repos --no-stream current-tripleo
-      become: true
-    - name: Install required packages
-      become: true
-      package:
-        name: "{{ required_packages }}"
-        state: latest
     - name: Create container-puppet dir
       become: true
       file:

tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml

@@ -21,7 +21,5 @@
     test_deps_setup_stream: false
   roles:
     - role: test_deps
-  post_tasks:
-    - name: Create tripleo repos
-      command: tripleo-repos --no-stream current-tripleo
-      become: true
+      test_deps_setup_tripleo: true
+      test_deps_setup_stream: false