aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-05-05 07:58:45 +0000
committerpmikus <pmikus@cisco.com>2021-05-05 07:58:45 +0000
commit57c5899110d3d84442dd3e9bfe4a9ceb5c0044a0 (patch)
tree1174cdb8a3b08dc0e59bcbb18f24436db1dc59e3
parented54e298a1b7796e37c1d1f4e0642595177949bd (diff)
FIX: Vagrant ansible install
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Ia81698d423f8545985bc1451080ae02cec91822b
-rw-r--r--csit.infra.vagrant/Vagrantfile4
-rw-r--r--fdio.infra.ansible/roles/python_env/tasks/main.yaml2
2 files changed, 3 insertions, 3 deletions
diff --git a/csit.infra.vagrant/Vagrantfile b/csit.infra.vagrant/Vagrantfile
index 8a6e8d19b2..f951425e86 100644
--- 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 197b0ccac6..261e15ac32 100644
--- 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