FIX: Vagrant ansible install

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ia81698d423f8545985bc1451080ae02cec91822b

diff --git a/csit.infra.vagrant/Vagrantfile b/csit.infra.vagrant/Vagrantfile
index 8a6e8d1..f951425 100644 (file)
--- a/csit.infra.vagrant/Vagrantfile
+++ b/csit.infra.vagrant/Vagrantfile
@@ -32,9 +32,7 @@ Vagrant.configure("2") do |config|
     # Provision the box using ansible local (no Ansible installation needed
     # on host).
     config.vm.provision "ansible_local" do |ansible|
-        ansible.version = "2.10.8"
-        ansible.install_mode = "pip"
-        ansible.pip_install_cmd = "curl -s https://bootstrap.pypa.io/get-pip.py | sudo python3"
+        ansible.version = "latest"
         ansible.become = true
         ansible.verbose = false
         ansible.limit = "vagrant"

diff --git a/fdio.infra.ansible/roles/python_env/tasks/main.yaml b/fdio.infra.ansible/roles/python_env/tasks/main.yaml
index 197b0cc..261e15a 100644 (file)
--- a/fdio.infra.ansible/roles/python_env/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/python_env/tasks/main.yaml
@@ -71,6 +71,8 @@
       - "sphinxcontrib-qthelp==1.0.3"
       - "sphinxcontrib-serializinghtml==1.1.4"
       - "urllib3==1.25.6"
+  environment:
+    ANSIBLE_SKIP_CONFLICT_CHECK: 1
   tags:
     - common-inst-pip