test_deps: Let test_deps use ceph repo
test_deps can be configured to use --stream/--no-stream, this patch also adds the possibility of adding the ceph repo. Also modifies some molecule tests to use the role test_deps with/without stream and ceph, installing the extra packages with it. Change-Id: Iab2fe17de56fec2deffae7bc3b45e775a26c8122
This commit is contained in:
parent
8f9a141bf9
commit
54f77de79f
|
@ -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_repo_version: "{{ ansible_facts['distribution'] | lower }}{{ ansible_facts['distribution_major_version'] }}-master"
|
||||||
test_deps_mirrors_file_path: /etc/ci/mirror_info.sh
|
test_deps_mirrors_file_path: /etc/ci/mirror_info.sh
|
||||||
test_deps_setup_stream: true
|
test_deps_setup_stream: true
|
||||||
|
test_deps_setup_ceph: false
|
||||||
|
|
|
@ -71,7 +71,8 @@
|
||||||
- test_deps_setup_tripleo | bool
|
- test_deps_setup_tripleo | bool
|
||||||
block:
|
block:
|
||||||
- name: Create tripleo repos
|
- 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
|
- name: Install tripleo packages
|
||||||
package:
|
package:
|
||||||
|
|
|
@ -19,14 +19,12 @@
|
||||||
hosts: all
|
hosts: all
|
||||||
roles:
|
roles:
|
||||||
- role: test_deps
|
- role: test_deps
|
||||||
|
test_deps_setup_tripleo: true
|
||||||
|
test_deps_setup_stream: false
|
||||||
|
test_deps_setup_ceph: true
|
||||||
|
test_deps_extra_packages:
|
||||||
|
- openssh
|
||||||
tasks:
|
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
|
- name: Ensure ceph-admin group exists
|
||||||
group:
|
group:
|
||||||
name: ceph-admin
|
name: ceph-admin
|
||||||
|
|
|
@ -17,22 +17,14 @@
|
||||||
|
|
||||||
- name: Prepare
|
- name: Prepare
|
||||||
hosts: all
|
hosts: all
|
||||||
vars:
|
|
||||||
test_deps_setup_stream: false
|
|
||||||
required_packages:
|
|
||||||
- facter
|
|
||||||
- rsync
|
|
||||||
roles:
|
roles:
|
||||||
- role: test_deps
|
- role: test_deps
|
||||||
|
test_deps_setup_tripleo: true
|
||||||
|
test_deps_setup_stream: false
|
||||||
|
test_deps_extra_packages:
|
||||||
|
- facter
|
||||||
|
- rsync
|
||||||
post_tasks:
|
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
|
- name: Create container-puppet dir
|
||||||
become: true
|
become: true
|
||||||
file:
|
file:
|
||||||
|
|
|
@ -21,7 +21,5 @@
|
||||||
test_deps_setup_stream: false
|
test_deps_setup_stream: false
|
||||||
roles:
|
roles:
|
||||||
- role: test_deps
|
- role: test_deps
|
||||||
post_tasks:
|
test_deps_setup_tripleo: true
|
||||||
- name: Create tripleo repos
|
test_deps_setup_stream: false
|
||||||
command: tripleo-repos --no-stream current-tripleo
|
|
||||||
become: true
|
|
||||||
|
|
Loading…
Reference in New Issue