Infra: Ansible 2.10

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I6b058ff30628c7e066372fec2141a8bcc18c3997

diff --git a/requirements.txt b/requirements.txt
index 8c09282..5190614 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,8 +27,8 @@ robotframework==3.1.2
 scapy==2.4.3
 scp==0.13.2
 
 scapy==2.4.3
 scp==0.13.2
 

-# Bootstraping dependencies
-ansible==2.7.8
+# IaaC dependencies
+ansible==2.10.7

 
 # PLRsearch dependencies
 dill==0.2.8.2
 
 # PLRsearch dependencies
 dill==0.2.8.2

diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py
index 45447e9..6df6f0d 100644 (file)
--- a/resources/libraries/python/SetupFramework.py
+++ b/resources/libraries/python/SetupFramework.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.

 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:


@@ -126,7 +126,8 @@ def create_env_directory_at_node(node):
     )
     cmd = f"cd {con.REMOTE_FW_DIR} && rm -rf env && virtualenv " \
         f"-p $(which python3) --system-site-packages --never-download env " \
     )
     cmd = f"cd {con.REMOTE_FW_DIR} && rm -rf env && virtualenv " \
         f"-p $(which python3) --system-site-packages --never-download env " \

-        f"&& source env/bin/activate && pip3 install -r requirements.txt"
+        f"&& source env/bin/activate && ANSIBLE_SKIP_CONFLICT_CHECK=1 " \
+        f"pip3 install -r requirements.txt"

     exec_cmd_no_error(
         node, cmd, timeout=100, include_reason=True,
         message=f"Failed install at node {node[u'type']} host {node[u'host']}, "
     exec_cmd_no_error(
         node, cmd, timeout=100, include_reason=True,
         message=f"Failed install at node {node[u'type']} host {node[u'host']}, "

diff --git a/resources/tools/testbed-setup/ansible/dev.yaml b/resources/tools/testbed-setup/ansible/dev.yaml
index 48ec6b2..6f6d2a7 100644 (file)
--- a/resources/tools/testbed-setup/ansible/dev.yaml
+++ b/resources/tools/testbed-setup/ansible/dev.yaml
@@ -5,6 +5,12 @@
   remote_user: testuser
   become: yes
   become_user: root
   remote_user: testuser
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: user_add
       tags: user_add
   roles:
     - role: user_add
       tags: user_add

diff --git a/resources/tools/testbed-setup/ansible/nomad.yaml b/resources/tools/testbed-setup/ansible/nomad.yaml
index db1c396..88d5165 100644 (file)
--- a/resources/tools/testbed-setup/ansible/nomad.yaml
+++ b/resources/tools/testbed-setup/ansible/nomad.yaml
@@ -5,6 +5,12 @@
   remote_user: testuser
   become: yes
   become_user: root
   remote_user: testuser
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: user_add
       tags: user_add
   roles:
     - role: user_add
       tags: user_add

diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index 35368dd..7a0e9e1 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -39,7 +39,7 @@
       - "robotframework==3.1.2"
       - "scapy==2.4.3"
       - "scp==0.13.2"
       - "robotframework==3.1.2"
       - "scapy==2.4.3"
       - "scp==0.13.2"

-      - "ansible==2.7.8"
+      - "ansible==2.10.7"

       - "dill==0.2.8.2"
       - "numpy==1.17.3"
       - "hdrhistogram==0.6.1"
       - "dill==0.2.8.2"
       - "numpy==1.17.3"
       - "hdrhistogram==0.6.1"

diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index 302fa1b..9449316 100644 (file)
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -5,6 +5,12 @@
   remote_user: testuser
   become: yes
   become_user: root
   remote_user: testuser
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: baremetal
       tags: baremetal
   roles:
     - role: baremetal
       tags: baremetal

diff --git a/resources/tools/testbed-setup/ansible/sut_azure.yaml b/resources/tools/testbed-setup/ansible/sut_azure.yaml
index 835ab63..a3a24a4 100644 (file)
--- a/resources/tools/testbed-setup/ansible/sut_azure.yaml
+++ b/resources/tools/testbed-setup/ansible/sut_azure.yaml
@@ -4,6 +4,12 @@
 - hosts: sut
   become: yes
   become_user: root
 - hosts: sut
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: user_add
       tags: user_add
   roles:
     - role: user_add
       tags: user_add

diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml
index fc18038..2b375b7 100644 (file)
--- a/resources/tools/testbed-setup/ansible/tg.yaml
+++ b/resources/tools/testbed-setup/ansible/tg.yaml
@@ -5,6 +5,12 @@
   remote_user: testuser
   become: yes
   become_user: root
   remote_user: testuser
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: baremetal
       tags: baremetal
   roles:
     - role: baremetal
       tags: baremetal

diff --git a/resources/tools/testbed-setup/ansible/tg_aws.yaml b/resources/tools/testbed-setup/ansible/tg_aws.yaml
index db0b574..17e8239 100644 (file)
--- a/resources/tools/testbed-setup/ansible/tg_aws.yaml
+++ b/resources/tools/testbed-setup/ansible/tg_aws.yaml
@@ -4,6 +4,12 @@
 - hosts: tg
   become: yes
   become_user: root
 - hosts: tg
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: user_add
       tags: user_add
   roles:
     - role: user_add
       tags: user_add

diff --git a/resources/tools/testbed-setup/ansible/tg_azure.yaml b/resources/tools/testbed-setup/ansible/tg_azure.yaml
index e6940a7..ef32016 100644 (file)
--- a/resources/tools/testbed-setup/ansible/tg_azure.yaml
+++ b/resources/tools/testbed-setup/ansible/tg_azure.yaml
@@ -4,6 +4,12 @@
 - hosts: tg
   become: yes
   become_user: root
 - hosts: tg
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: user_add
       tags: user_add
   roles:
     - role: user_add
       tags: user_add

diff --git a/resources/tools/testbed-setup/ansible/vpp_device.yaml b/resources/tools/testbed-setup/ansible/vpp_device.yaml
index 5281c57..d8efc05 100644 (file)
--- a/resources/tools/testbed-setup/ansible/vpp_device.yaml
+++ b/resources/tools/testbed-setup/ansible/vpp_device.yaml
@@ -5,6 +5,12 @@
   remote_user: testuser
   become: yes
   become_user: root
   remote_user: testuser
   become: yes
   become_user: root

+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always

   roles:
     - role: user_add
       tags: user_add
   roles:
     - role: user_add
       tags: user_add