diff options
author | Vratko Polak <vrpolak@cisco.com> | 2018-07-09 15:14:36 +0200 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2018-07-10 11:23:31 +0000 |
commit | 61ef529d33efd51acd1b1986c325d25a9d7ba705 (patch) | |
tree | cbb5ab397295053934160102dc62aea4d53da939 /resources/tools/testbed-setup/ansible/roles/tg | |
parent | 173a910c5f56106cd5aaa620ae0f9cfb94fcfac3 (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/tg')
-rw-r--r-- | resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml | 12 | ||||
-rw-r--r-- | resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml index 8e71800bca..54001a7272 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/main.yaml @@ -1,6 +1,6 @@ ----
-# file: roles/tg/tasks/main.yaml
-
-- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+--- +# file: roles/tg/tasks/main.yaml + +- name: Ubuntu specific + import_tasks: ubuntu_x86_64.yaml + when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64' diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml index 9711b2678d..54a04685e6 100644 --- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml +++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/ubuntu_x86_64.yaml @@ -1,9 +1,9 @@ ----
-# file: roles/tg/tasks/ubuntu_x86_64.yaml
-
-- name: Install Unzip
- apt:
- name: 'unzip'
- state: 'present'
- update_cache: True
- tags: install-unzip
+--- +# file: roles/tg/tasks/ubuntu_x86_64.yaml + +- name: Install Unzip + apt: + name: 'unzip' + state: 'present' + update_cache: True + tags: install-unzip |