From fee279119bfc51a21ac1ad77474f8ea31bd6fa03 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 30 May 2016 10:19:51 +0300 Subject: These changes are the initial support for kvmfornfv using compass. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5ab2d7ad2f639d6673e0debd8f07f4f95c8bb476 Signed-off-by: José Pekkarinen --- deploy/adapters/ansible/openstack/allinone.yml | 1 + deploy/adapters/ansible/openstack/compute.yml | 1 + .../ansible/roles/kvmfornfv/defaults/Debian.yaml | 16 +++++++++++++ .../ansible/roles/kvmfornfv/defaults/RedHat.yaml | 18 +++++++++++++++ .../ansible/roles/kvmfornfv/defaults/main.yml | 16 +++++++++++++ .../ansible/roles/kvmfornfv/tasks/main.yml | 27 ++++++++++++++++++++++ 6 files changed, 79 insertions(+) create mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml create mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml create mode 100644 deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml create mode 100644 deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml (limited to 'deploy') diff --git a/deploy/adapters/ansible/openstack/allinone.yml b/deploy/adapters/ansible/openstack/allinone.yml index 4539e5fb..fabc6eb4 100644 --- a/deploy/adapters/ansible/openstack/allinone.yml +++ b/deploy/adapters/ansible/openstack/allinone.yml @@ -3,6 +3,7 @@ sudo: True roles: - common + - kvmfornfv - database - mq - keystone diff --git a/deploy/adapters/ansible/openstack/compute.yml b/deploy/adapters/ansible/openstack/compute.yml index 8f6100ca..d0c41c3e 100644 --- a/deploy/adapters/ansible/openstack/compute.yml +++ b/deploy/adapters/ansible/openstack/compute.yml @@ -4,5 +4,6 @@ sudo: True roles: - common + - kvmfornfv - nova-compute - neutron-compute diff --git a/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml b/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml new file mode 100644 index 00000000..eef684f4 --- /dev/null +++ b/deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml @@ -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: + - 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 new file mode 100644 index 00000000..c462bde2 --- /dev/null +++ b/deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml @@ -0,0 +1,18 @@ +############################################################################## +## 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 new file mode 100644 index 00000000..e5343ccc --- /dev/null +++ b/deploy/adapters/ansible/roles/kvmfornfv/defaults/main.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 +############################################################################### +--- + +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 new file mode 100644 index 00000000..380882bb --- /dev/null +++ b/deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml @@ -0,0 +1,27 @@ +############################################################################## +## 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