[libvirt] [libvirt-jenkins-ci PATCH 1/5] ansible: Remove bootstrap phase

Having to bootstrap the guest as a separate phase is annoying and can be avoided by assuming the root password is well-known. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ansible/Makefile | 5 +---- ansible/bootstrap.yml | 15 --------------- ansible/group_vars/all/main.yml | 1 + ansible/site.yml | 8 ++++++++ 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 ansible/bootstrap.yml diff --git a/ansible/Makefile b/ansible/Makefile index 39ebe52..6af7ae3 100644 --- a/ansible/Makefile +++ b/ansible/Makefile @@ -3,10 +3,7 @@ all: site: @ansible-playbook site.yml -bootstrap: - @ansible-playbook --ask-pass bootstrap.yml - clean: @rm -f *.retry log -.PHONY: all site bootstrap clean +.PHONY: all site clean diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml deleted file mode 100644 index 544dd9d..0000000 --- a/ansible/bootstrap.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- hosts: all - gather_facts: no - - tasks: - - # Bootstrap Ansible itself - - include: tasks/bootstrap.yml - -- hosts: all - - tasks: - - # Prepare the base environment - - include: tasks/base.yml diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml index 81b7d43..493a51d 100644 --- a/ansible/group_vars/all/main.yml +++ b/ansible/group_vars/all/main.yml @@ -1,5 +1,6 @@ --- ansible_user: root +ansible_ssh_pass: root jenkins_url: https://ci.centos.org/computer/{{ inventory_hostname }}/slave-agent.jnlp diff --git a/ansible/site.yml b/ansible/site.yml index e6cf10d..9c75dcb 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,5 +1,13 @@ --- - hosts: all + gather_facts: no + + tasks: + + # Bootstrap Ansible itself + - include: tasks/bootstrap.yml + +- hosts: all vars_files: - vars/mappings.yml -- 2.13.6