From 0351663ac49a41706954115d2919729ffc5272c7 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Mon, 6 Mar 2017 10:00:18 +0800
Subject: add open-o scenario

add os-nosdn-openo-ha.yml and network_openo.yml in:
1. huawei-pod1
2. huawei-pod2
3. intel-pod8

Change-Id: I89ad426c1e3006bf2ef218cd9b55d97e53aa8721
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 deploy/conf/vm_environment/os-nosdn-openo-ha.yml   | 46 ++++++++++++++++++++++
 deploy/conf/vm_environment/os-nosdn-openo-noha.yml | 45 ---------------------
 2 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 deploy/conf/vm_environment/os-nosdn-openo-ha.yml
 delete mode 100644 deploy/conf/vm_environment/os-nosdn-openo-noha.yml

(limited to 'deploy/conf/vm_environment')

diff --git a/deploy/conf/vm_environment/os-nosdn-openo-ha.yml b/deploy/conf/vm_environment/os-nosdn-openo-ha.yml
new file mode 100644
index 00000000..c26567f3
--- /dev/null
+++ b/deploy/conf/vm_environment/os-nosdn-openo-ha.yml
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2017 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
+
+deploy_options:
+  - orchestrator: open-o
+  - application: clearwater
+
+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
diff --git a/deploy/conf/vm_environment/os-nosdn-openo-noha.yml b/deploy/conf/vm_environment/os-nosdn-openo-noha.yml
deleted file mode 100644
index 45d29a3b..00000000
--- a/deploy/conf/vm_environment/os-nosdn-openo-noha.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-
-deploy_options:
-  - orchestrator: open-o
-
-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
-- 
cgit 1.2.3-korg