aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup/ansible/roles/sut
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2018-07-09 15:14:36 +0200
committerPeter Mikus <pmikus@cisco.com>2018-07-10 11:23:31 +0000
commit61ef529d33efd51acd1b1986c325d25a9d7ba705 (patch)
treecbb5ab397295053934160102dc62aea4d53da939 /resources/tools/testbed-setup/ansible/roles/sut
parent173a910c5f56106cd5aaa620ae0f9cfb94fcfac3 (diff)
Remove THIS tag and use unix endlines
The THIS tag has sneaked in 10Ge2P1X520-Eth-L2Xcbase-Eth-1Memif-1Dcr-Mrr but usually it is only to be used in draft testing. Not sure about the way non-unix endlines crept in. Is not git supposed to perform endline conversions on text files? Or are .robot, .rst, .yaml and .vat not recognized as text? Change-Id: Ia78cf942c05c3029c340a8639782786f37e57469 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles/sut')
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml28
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml180
2 files changed, 104 insertions, 104 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
index ffdbbcc860..0ecdcdba3b 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
@@ -1,14 +1,14 @@
----
-# file: roles/sut/tasks/main.yaml
-
-- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
-
-- name: Copy 80-vpp.conf
- file:
- src: '/dev/null'
- dest: '/etc/sysctl.d/80-vpp.conf'
- state: 'link'
- become: yes
- tags: copy-80-vpp
+---
+# file: roles/sut/tasks/main.yaml
+
+- name: Ubuntu specific
+ import_tasks: ubuntu_x86_64.yaml
+ when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+
+- name: Copy 80-vpp.conf
+ file:
+ src: '/dev/null'
+ dest: '/etc/sysctl.d/80-vpp.conf'
+ state: 'link'
+ become: yes
+ tags: copy-80-vpp
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
index f9ab901ded..6c9a839730 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
@@ -1,90 +1,90 @@
----
-# file: roles/sut/tasks/ubuntu_x86_64.yaml
-
-- name: Install DKMS
- apt:
- name: 'dkms'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-dkms
-
-- name: Install pkg-config
- apt:
- name: 'pkg-config'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-pkg-config
-
-- name: Install libglib2.0-dev
- apt:
- name: 'libglib2.0-dev'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libglib2.0-dev
-
-- name: Install autoconf
- apt:
- name: 'autoconf'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-autoconf
-
-- name: Install libtool
- apt:
- name: 'libtool'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libtool
-
-- name: Install screen
- apt:
- name: 'screen'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-screen
-
-- name: Install libmbedcrypto1
- apt:
- name: 'libmbedcrypto1'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libmbedcrypto1
-
-- name: Install libmbedtls10
- apt:
- name: 'libmbedtls10'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libmbedtls10
-
-- name: Install libmbedx509-0
- apt:
- name: 'libmbedx509-0'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-libmbedx509-0
-
-- name: Install lxc
- apt:
- name: 'lxc'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-lxc
-
-- name: Install java
- apt:
- name: 'openjdk-8-jdk'
- state: 'present'
- update_cache: True
- become: yes
- tags: install-java
+---
+# file: roles/sut/tasks/ubuntu_x86_64.yaml
+
+- name: Install DKMS
+ apt:
+ name: 'dkms'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-dkms
+
+- name: Install pkg-config
+ apt:
+ name: 'pkg-config'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-pkg-config
+
+- name: Install libglib2.0-dev
+ apt:
+ name: 'libglib2.0-dev'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libglib2.0-dev
+
+- name: Install autoconf
+ apt:
+ name: 'autoconf'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-autoconf
+
+- name: Install libtool
+ apt:
+ name: 'libtool'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libtool
+
+- name: Install screen
+ apt:
+ name: 'screen'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-screen
+
+- name: Install libmbedcrypto1
+ apt:
+ name: 'libmbedcrypto1'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libmbedcrypto1
+
+- name: Install libmbedtls10
+ apt:
+ name: 'libmbedtls10'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libmbedtls10
+
+- name: Install libmbedx509-0
+ apt:
+ name: 'libmbedx509-0'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-libmbedx509-0
+
+- name: Install lxc
+ apt:
+ name: 'lxc'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-lxc
+
+- name: Install java
+ apt:
+ name: 'openjdk-8-jdk'
+ state: 'present'
+ update_cache: True
+ become: yes
+ tags: install-java