From d635bd1f5762acd78545b650b2f55c112643b486 Mon Sep 17 00:00:00 2001
From: huangxiangyu <huangxiangyu5@huawei.com>
Date: Thu, 18 May 2017 15:38:25 +0800
Subject: support Containerized compass-core

JIRA: COMPASS-534

1. rm compass vm and add ansible to bring up 5 compass
   containers
2. use tar package instead of compass.iso which contains
   compass docker images, OS ISO, PPA, pip packages.
3. modify client.py to communicate with containerized
   compass-core
4. modify cobbler files and ansible callback files
   to adapt with containerized compass-core
5. upgrade openstack version to ocata
6. use the openstack-ansible to deploy openstack
7. virtual deploy external use nat

Change-Id: Ifa2a3f5b8c7c32224ac4276fd3d4cc2b0d270a26
Signed-off-by: huangxiangyu <huangxiangyu5@huawei.com>
---
 deploy/compass_conf/flavor/openstack_newton.conf | 32 ------------------------
 deploy/compass_conf/flavor/openstack_ocata.conf  | 32 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100755 deploy/compass_conf/flavor/openstack_newton.conf
 create mode 100755 deploy/compass_conf/flavor/openstack_ocata.conf

(limited to 'deploy/compass_conf/flavor')

diff --git a/deploy/compass_conf/flavor/openstack_newton.conf b/deploy/compass_conf/flavor/openstack_newton.conf
deleted file mode 100755
index 2861ccdf..00000000
--- a/deploy/compass_conf/flavor/openstack_newton.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_newton'
-FLAVORS = [{
-    'flavor': 'allinone',
-    'display_name': 'All-In-One',
-    'template': 'allinone.tmpl',
-    'roles': ['allinone-compute'],
-}, {
-    'flavor': 'single-controller',
-    'display_name': 'Single Controller',
-    'template': 'single-controller.tmpl',
-    'roles': [
-        'controller', 'compute', 'network', 'storage', 'odl', 'onos'
-    ],
-}, {
-    'flavor': 'multinodes',
-    'display_name': 'Multi-nodes',
-    'template': 'multinodes.tmpl',
-    'roles': [
-        'compute-controller', 'compute-worker', 'network-server',
-        'network-worker', 'database', 'messaging', 'image', 'odl',
-        'dashboard', 'identity', 'storage-controller', 'storage-volume'
-    ],
-}, {
-    'flavor': 'HA-ansible-multinodes-newton',
-    'display_name': 'HA-ansible-multinodes-newton',
-    'template': 'HA-ansible-multinodes.tmpl',
-    'roles': [
-        'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
-    ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor/openstack_ocata.conf b/deploy/compass_conf/flavor/openstack_ocata.conf
new file mode 100755
index 00000000..c532ac6c
--- /dev/null
+++ b/deploy/compass_conf/flavor/openstack_ocata.conf
@@ -0,0 +1,32 @@
+ADAPTER_NAME = 'openstack_ocata'
+FLAVORS = [{
+    'flavor': 'allinone',
+    'display_name': 'All-In-One',
+    'template': 'allinone.tmpl',
+    'roles': ['allinone-compute'],
+}, {
+    'flavor': 'single-controller',
+    'display_name': 'Single Controller',
+    'template': 'single-controller.tmpl',
+    'roles': [
+        'controller', 'compute', 'network', 'storage', 'odl', 'onos'
+    ],
+}, {
+    'flavor': 'multinodes',
+    'display_name': 'Multi-nodes',
+    'template': 'multinodes.tmpl',
+    'roles': [
+        'compute-controller', 'compute-worker', 'network-server',
+        'network-worker', 'database', 'messaging', 'image', 'odl',
+        'dashboard', 'identity', 'storage-controller', 'storage-volume'
+    ],
+}, {
+    'flavor': 'HA-ansible-multinodes-ocata',
+    'display_name': 'HA-ansible-multinodes-ocata',
+    'template': 'HA-ansible-multinodes.tmpl',
+    'roles': [
+        'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
+    ],
+}]
+
+
-- 
cgit 1.2.3-korg