5 files changed, 129 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
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 42fca803..971db056 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -93,6 +93,8 @@ function inject_compass_conf() {
 function refresh_compass_core () {
     sudo docker exec compass-deck bash -c "/opt/compass/bin/manage_db.py createdb"
     sudo docker exec compass-deck bash -c "/root/compass-deck/bin/clean_installers.py"
+    sudo docker exec compass-tasks bash -c \
+    "ps aux | grep -E '[a]nsible-playbook|[o]penstack-ansible' | awk '{print \$2}' | xargs kill -9"
     sudo rm -rf $WORK_DIR/docker/ansible/run/*
 }
 
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml
new file mode 100644
index 00000000..678fad22
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml
@@ -0,0 +1,74 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD 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
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+plugins:
+  - rt_kvm: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'F8:4A:BF:55:A2:8D'
+    interfaces:
+      - eth1: 'F8:4A:BF:55:A2:8E'
+    ipmiIp: 172.16.130.26
+    ipmiPass: Huawei@123
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'D8:49:0B:DA:5A:B7'
+    interfaces:
+      - eth1: 'D8:49:0B:DA:5A:B8'
+    ipmiIp: 172.16.130.27
+    ipmiPass: huawei@123
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: '78:D7:52:A0:B1:99'
+    interfaces:
+      - eth1: '78:D7:52:A0:B1:9A'
+    ipmiIp: 172.16.130.29
+    ipmiPass: Huawei@123
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'D8:49:0B:DA:5B:5D'
+    interfaces:
+      - eth1: 'D8:49:0B:DA:5B:5E'
+    ipmiIp: 172.16.130.30
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'D8:49:0B:DA:56:85'
+    interfaces:
+      - eth1: 'D8:49:0B:DA:56:86'
+    ipmiIp: 172.16.130.31
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-nosdn-kvm-ha.yml b/deploy/conf/vm_environment/os-nosdn-kvm-ha.yml
new file mode 100644
index 00000000..fd2ede2f
--- /dev/null
+++ b/deploy/conf/vm_environment/os-nosdn-kvm-ha.yml
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD 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
+##############################################################################
+
+---
+TYPE: virtual
+FLAVOR: cluster
+
+plugins:
+  - rt_kvm: "Enable"
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    roles:
+      - compute
+      - ceph-osd