From 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Tue, 27 Dec 2016 17:44:34 +0800
Subject: Yamllint test

JIRA: COMPASS-516

Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../ansible/roles/kvmfornfv/defaults/Debian.yaml       | 16 ----------------
 .../ansible/roles/kvmfornfv/defaults/Debian.yml        | 15 +++++++++++++++
 .../ansible/roles/kvmfornfv/defaults/RedHat.yaml       | 18 ------------------
 .../ansible/roles/kvmfornfv/defaults/RedHat.yml        | 16 ++++++++++++++++
 .../adapters/ansible/roles/kvmfornfv/defaults/main.yml |  1 -
 deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml |  5 +++--
 6 files changed, 34 insertions(+), 37 deletions(-)
 delete mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml
 create mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml
 delete mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml
 create mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml

(limited to 'deploy/adapters/ansible/roles/kvmfornfv')

diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml
deleted file mode 100644
index eef684f4..00000000
--- a/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-##############################################################################
-## Copyright (c) 2015 Nokia and others.
-##
-## All rights reserved. This program and the accompanying materials
-## are made available under the terms of the Apache License, Version 2.0
-## which accompanies this distribution, and is available at
-## http://www.apache.org/licenses/LICENSE-2.0
-###############################################################################
----
-
-packages:
-  - qemu-kvm
-  - grub-pc
-  - zlib1g
-  - libglib2.0
-
diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml
new file mode 100644
index 00000000..d273808a
--- /dev/null
+++ b/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml
@@ -0,0 +1,15 @@
+##############################################################################
+## Copyright (c) 2015 Nokia and others.
+##
+## All rights reserved. This program and the accompanying materials
+## are made available under the terms of the Apache License, Version 2.0
+## which accompanies this distribution, and is available at
+## http://www.apache.org/licenses/LICENSE-2.0
+###############################################################################
+---
+
+packages:
+  - qemu-kvm
+  - grub-pc
+  - zlib1g
+  - libglib2.0
diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml
deleted file mode 100644
index c462bde2..00000000
--- a/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-## Copyright (c) 2015 Nokia and others.
-##
-## All rights reserved. This program and the accompanying materials
-## are made available under the terms of the Apache License, Version 2.0
-## which accompanies this distribution, and is available at
-## http://www.apache.org/licenses/LICENSE-2.0
-###############################################################################
----
-
-packages:
-  - zlib
-  - glib2
-  - gettext
-  - qemu-kvm
-  - grub2
-
-
diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml
new file mode 100644
index 00000000..8e6551e8
--- /dev/null
+++ b/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml
@@ -0,0 +1,16 @@
+##############################################################################
+## Copyright (c) 2015 Nokia and others.
+##
+## All rights reserved. This program and the accompanying materials
+## are made available under the terms of the Apache License, Version 2.0
+## which accompanies this distribution, and is available at
+## http://www.apache.org/licenses/LICENSE-2.0
+###############################################################################
+---
+
+packages:
+  - zlib
+  - glib2
+  - gettext
+  - qemu-kvm
+  - grub2
diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml
index e5343ccc..d5549581 100644
--- a/deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml
+++ b/deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml
@@ -13,4 +13,3 @@ kernel_path: "{{ path }}/kernel"
 qemu_path: "{{ path }}/qemu"
 qemu_build_dir: "{{ qemu_path }}/build"
 package: kvmfornfv.tar.gz
-
diff --git a/deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml b/deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml
index 380882bb..a8b24b34 100644
--- a/deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml
@@ -12,7 +12,9 @@
   register: http_server
 
 - name: download kvmfornfv package file
-  get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/kvmfornfv/{{ package }}"  dest=/tmp/{{ package }}
+  get_url:
+    url: "http://{{ http_server.stdout_lines[0] }}/packages/kvmfornfv/{{ package }}"
+    dest: /tmp/{{ package }}
 
 - name: extract kvmfornfv files
   command: su -s /bin/sh -c "tar xzf /tmp/{{ package }} -C /"
@@ -24,4 +26,3 @@
 - name: Update grub on Ubuntu
   shell: grub-mkconfig -o /boot/grub/grub.conf
   when: ansible_os_family == 'Debian'
-
-- 
cgit 1.2.3-korg