summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-07-20 00:40:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-20 00:40:43 +0000
commit657249dad1bfee6fc190d0c63cf46a1ddfb9cad1 (patch)
tree6d9e36dff22efa9d3151346905c5d4e1ee700318 /deploy/adapters
parent588f2fa381c12e899843a0ab1235bcb0d57b49af (diff)
parent798f3a062a471a248b0f9131b5651660f431fbd5 (diff)
Merge "Add real time kvm feature from kvmfornfv project"
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml1
-rw-r--r--deploy/adapters/ansible/roles/config-osa/tasks/main.yml7
2 files changed, 8 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index ddf6f053..41139c5e 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -22,6 +22,7 @@
roles:
- config-compute
- storage
+ - rt_kvm
- hosts: localhost
remote_user: root
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index b86a3205..c7663916 100644
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -12,6 +12,13 @@
path: /var/log/osa/
state: directory
+- name: disable kernel update in rt_kvm scenario
+ lineinfile:
+ dest: /etc/ansible/roles/openstack_hosts/vars/ubuntu-16.04.yml
+ state: absent
+ regexp: 'linux-image-extra-*'
+ when: rt_kvm is defined and rt_kvm == "Enable"
+
- name: copy openstack_user_config
template:
src: openstack_user_config.yml.j2