From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001 From: chigang Date: Fri, 30 Jun 2017 20:24:25 +0800 Subject: Remove obsoleted code JIRA:- use OpenStack-ansible deploy openstack, so remove obsoleted code. Some of the enhanced features will be added in later versions Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3 Signed-off-by: chigang --- .../ansible/roles/kvmfornfv/defaults/Debian.yml | 15 ------------ .../ansible/roles/kvmfornfv/defaults/RedHat.yml | 16 ------------- .../ansible/roles/kvmfornfv/defaults/main.yml | 15 ------------ .../ansible/roles/kvmfornfv/tasks/main.yml | 28 ---------------------- 4 files changed, 74 deletions(-) delete mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml delete mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml delete mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml delete mode 100644 deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml (limited to 'deploy/adapters/ansible/roles/kvmfornfv') diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml deleted file mode 100644 index d273808a..00000000 --- a/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yml +++ /dev/null @@ -1,15 +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/RedHat.yml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml deleted file mode 100644 index 8e6551e8..00000000 --- a/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yml +++ /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: - - 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 deleted file mode 100644 index d5549581..00000000 --- a/deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml +++ /dev/null @@ -1,15 +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 -############################################################################### ---- - -path: /tmp/kvmfornfv -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 deleted file mode 100644 index a8b24b34..00000000 --- a/deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml +++ /dev/null @@ -1,28 +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 -############################################################################### ---- -- name: get package http server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: http_server - -- name: download kvmfornfv package file - 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 /" - -- name: Update grub on Centos - shell: grub2-mkconfig -o /boot/grub2/grub.conf - when: ansible_os_family == 'RedHat' - -- name: Update grub on Ubuntu - shell: grub-mkconfig -o /boot/grub/grub.conf - when: ansible_os_family == 'Debian' -- cgit 1.2.3-korg