aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-05-31 01:42:12 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-31 01:42:12 +0000
commit7bf45894e495eb1da57a1ff8619bf9e69eb9ca14 (patch)
treefb7ef56252af46e79477b1d8737c339c353589e6 /deploy
parentf79ca6b0696ed332dc83e46ecf7dc76a639edff8 (diff)
parentfee279119bfc51a21ac1ad77474f8ea31bd6fa03 (diff)
Merge "These changes are the initial support for kvmfornfv using compass."
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/ansible/openstack/allinone.yml1
-rw-r--r--deploy/adapters/ansible/openstack/compute.yml1
-rw-r--r--deploy/adapters/ansible/roles/kvmfornfv/defaults/Debian.yaml16
-rw-r--r--deploy/adapters/ansible/roles/kvmfornfv/defaults/RedHat.yaml18
-rw-r--r--deploy/adapters/ansible/roles/kvmfornfv/defaults/main.yml16
-rw-r--r--deploy/adapters/ansible/roles/kvmfornfv/tasks/main.yml27
6 files changed, 79 insertions, 0 deletions
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'
+