aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/testbed-setup/ansible/site.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/site_azure.yaml8
-rw-r--r--resources/tools/testbed-setup/ansible/sut.yaml37
-rw-r--r--resources/tools/testbed-setup/ansible/sut_azure.yaml31
-rw-r--r--resources/tools/testbed-setup/ansible/tg.yaml39
-rw-r--r--resources/tools/testbed-setup/ansible/tg_azure.yaml33
6 files changed, 78 insertions, 72 deletions
diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml
index 1d755dbae0..4436c21b18 100644
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/resources/tools/testbed-setup/ansible/site.yaml
@@ -5,11 +5,13 @@
tags:
- tg
- tg_aws
+ - tg_azure
- import_playbook: sut.yaml
tags:
- sut
- sut_aws
+ - sut_azure
- import_playbook: vpp_device.yaml
tags:
diff --git a/resources/tools/testbed-setup/ansible/site_azure.yaml b/resources/tools/testbed-setup/ansible/site_azure.yaml
deleted file mode 100644
index c60e8b8f30..0000000000
--- a/resources/tools/testbed-setup/ansible/site_azure.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# file: site_azure.yaml
-
-- import_playbook: tg_azure.yaml
- tags: tg
-
-- import_playbook: sut_azure.yaml
- tags: sut
diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index 972c56b72b..afa4d40ef5 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -41,6 +41,12 @@
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
@@ -62,3 +68,34 @@
# resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
# - role: calibration
# tags: calibration
+
+- hosts: sut_azure
+ become: yes
+ become_user: root
+ gather_facts: false
+ pre_tasks:
+ - name: Gathering Facts
+ gather_facts:
+ tags:
+ - always
+ roles:
+ - role: user_add
+ tags: user_add
+ - role: common
+ tags: common
+ - role: docker
+ tags: docker
+ - role: vpp
+ tags: vpp
+ - role: azure
+ tags: azure
+ - role: iperf
+ tags: iperf
+ - role: dpdk
+ tags: dpdk
+ - role: cleanup
+ tags: cleanup
+ # TODO: 'Check Kernel Parameters' failing in
+ # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+ # - role: calibration
+ # tags: calibration
diff --git a/resources/tools/testbed-setup/ansible/sut_azure.yaml b/resources/tools/testbed-setup/ansible/sut_azure.yaml
deleted file mode 100644
index eb1b001ca2..0000000000
--- a/resources/tools/testbed-setup/ansible/sut_azure.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# file: sut_azure.yaml
-
-- 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
- - role: common
- tags: common
- - role: docker
- tags: docker
- - role: vpp
- tags: vpp
- - role: azure
- tags: azure
- - role: iperf
- tags: iperf
- - role: dpdk
- tags: dpdk
- - role: cleanup
- tags: cleanup
-# - role: calibration
-# tags: calibration
diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml
index 3de55e62e8..2b18b5d85d 100644
--- a/resources/tools/testbed-setup/ansible/tg.yaml
+++ b/resources/tools/testbed-setup/ansible/tg.yaml
@@ -41,6 +41,12 @@
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
@@ -66,3 +72,36 @@
# resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
# - role: calibration
# tags: calibration
+
+- hosts: tg_azure
+ become: yes
+ become_user: root
+ gather_facts: false
+ pre_tasks:
+ - name: Gathering Facts
+ gather_facts:
+ tags:
+ - always
+ roles:
+ - role: user_add
+ tags: user_add
+ - role: common
+ tags: common
+ - role: azure
+ tags: azure
+ - role: docker
+ tags: docker
+ - role: tg
+ tags: tg
+ - role: iperf
+ tags: iperf
+ - role: trex
+ tags: trex
+ - role: ab
+ tags: ab
+ - role: cleanup
+ tags: cleanup
+ # TODO: 'Check Kernel Parameters' failing in
+ # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+ # - role: calibration
+ # tags: calibration \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/tg_azure.yaml b/resources/tools/testbed-setup/ansible/tg_azure.yaml
deleted file mode 100644
index 3713dc845f..0000000000
--- a/resources/tools/testbed-setup/ansible/tg_azure.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# file: tg_azure.yaml
-
-- 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
- - role: common
- tags: common
- - role: azure
- tags: azure
- - role: docker
- tags: docker
- - role: tg
- tags: tg
- - role: iperf
- tags: iperf
- - role: trex
- tags: trex
- - role: ab
- tags: ab
- - role: cleanup
- tags: cleanup
-# - role: calibration
-# tags: calibration