Merge "Run k8s in CI"

2 files changed, 46 insertions, 0 deletions

diff --git a/ci/deploy_ci.sh b/ci/deploy_ci.sh
index 55a0129d..5fa19cef 100755
--- a/ci/deploy_ci.sh
+++ b/ci/deploy_ci.sh
@@ -18,6 +18,10 @@ case $DEPLOY_SCENARIO in
         echo "os-onos-sfc-ha scenario supports mitaka only"
         exit 1
         ;;
+    k8-nosdn-nofeature-ha)
+        export COMPASS_OS_VERSION=centos7
+        export KUBERNETES_VERSION="v1.7.3"
+        ;;
 esac
 
 if [[ $ROOT_BUILD_CAUSE == MANUALTRIGGER ]]; then
diff --git a/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml b/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
new file mode 100644
index 00000000..d098afba
--- /dev/null
+++ b/deploy/conf/vm_environment/k8-nosdn-nofeature-ha.yml
@@ -0,0 +1,42 @@
+##############################################################################
+# 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
+
+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