mirror of https://github.com/ceph/ceph-ansible.git
tests: fix task in rhcs_setup that changes vagrant box to rhel7
Signed-off-by: Andrew Schoen <aschoen@redhat.com>pull/1389/head
parent
28f1f24759
commit
b0caeed682
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- hosts: local
|
- hosts: all
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
become: yes
|
become: yes
|
||||||
tags:
|
tags:
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
replace:
|
replace:
|
||||||
regexp: "centos/7"
|
regexp: "centos/7"
|
||||||
replace: "rhel7"
|
replace: "rhel7"
|
||||||
path: "{{ change_dir }}/vagrant_variables.yml"
|
dest: "{{ change_dir }}/vagrant_variables.yml"
|
||||||
when: change_dir is defined
|
when: change_dir is defined
|
||||||
|
|
||||||
- hosts: all
|
- hosts: all
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -96,7 +96,7 @@ changedir=
|
||||||
update_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal
|
update_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal
|
||||||
update_cluster: {toxinidir}/tests/functional/centos/7/cluster
|
update_cluster: {toxinidir}/tests/functional/centos/7/cluster
|
||||||
commands=
|
commands=
|
||||||
rhcs: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
|
rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
|
||||||
|
|
||||||
vagrant up --no-provision {posargs:--provider=virtualbox}
|
vagrant up --no-provision {posargs:--provider=virtualbox}
|
||||||
bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
|
bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
|
||||||
|
|
Loading…
Reference in New Issue