From: Andrew Schoen Date: Wed, 12 Apr 2017 12:53:49 +0000 (-0500) Subject: tests: set needed config in group_vars/all for rhcs testing X-Git-Tag: v2.2.1^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6f12fab3eac78dbf9798c80796a94bd0e1df0cc;p=ceph-ansible.git tests: set needed config in group_vars/all for rhcs testing Instead of relying on environment variables and --extra-vars simply modify the group_vars/all that ships with the specific testing scenario to enable ceph_rchs testing. Signed-off-by: Andrew Schoen (cherry picked from commit 386afbec83b72dcc3a552682d4376d1bf6a99417) Conflicts: tests/functional/rhcs_setup.yml --- diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml index f066fbd6a..6a2b518f8 100644 --- a/tests/functional/rhcs_setup.yml +++ b/tests/functional/rhcs_setup.yml @@ -20,6 +20,32 @@ dest: "{{ change_dir }}/vagrant_variables.yml" when: change_dir is defined + - name: change centos/atomic-host vagrant box name to rhel7 + replace: + regexp: "centos/atomic-host" + replace: "rhel7" + dest: "{{ change_dir }}/vagrant_variables.yml" + when: change_dir is defined + + - name: change ceph_stable to False + replace: + regexp: "ceph_stable:.*" + replace: "ceph_stable: False" + dest: "{{ change_dir }}/group_vars/all" + when: change_dir is defined + + - name: set ceph_rhcs to True + lineinfile: + line: "ceph_rhcs: True" + dest: "{{ change_dir }}/group_vars/all" + when: change_dir is defined + + - name: set ceph_origin to distro + lineinfile: + line: "ceph_origin: distro" + dest: "{{ change_dir }}/group_vars/all" + when: change_dir is defined + - hosts: all gather_facts: true become: yes