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>
---
 .../HA-ansible-multinodes-newton.conf              | 124 ---------------------
 .../HA-ansible-multinodes-ocata.conf               | 124 +++++++++++++++++++++
 2 files changed, 124 insertions(+), 124 deletions(-)
 delete mode 100755 deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
 create mode 100755 deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf

(limited to 'deploy/compass_conf/flavor_mapping')

diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
deleted file mode 100755
index 702f89cd..00000000
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
+++ /dev/null
@@ -1,124 +0,0 @@
-ADAPTER = 'openstack_newton'
-FLAVOR = 'HA-ansible-multinodes-newton'
-CONFIG_MAPPING = {
-    "mapped_name": "flavor_config",
-    "mapped_children": [{
-        "security": {
-            "accordion_heading": "OpenStack Database and Queue Credentials",
-            "category": "service_credentials",
-            "data_structure": "table",
-            "action": "true",
-            "modifiable_data": ["username", "password"],
-            "table_display_header": ["Service", "UserName", "Password", "Action"],
-            "config": {
-                "rabbitmq": {
-                    "username": "guest",
-                    "password": "guest"
-                },
-                "compute": {
-                    "username": "nova",
-                    "password": "nova"
-                },
-                "dashboard": {
-                    "username": "dashboard",
-                    "password": "dashboard"
-                },
-                "identity": {
-                    "username": "keystone",
-                    "password": "keystone"
-                },
-                "image": {
-                    "username": "glance",
-                    "password": "glance"
-                },
-                "metering": {
-                    "username": "ceilometer",
-                    "password": "ceilometer"
-                },
-                "alarming": {
-                    "username": "aodh",
-                    "password": "aodh"
-                },
-                "network": {
-                    "username": "neutron",
-                    "password": "neutron"
-                },
-                "mysql": {
-                    "username": "root",
-                    "password": "root"
-                },
-                "volume": {
-                    "username": "cinder",
-                    "password": "cinder"
-                },
-                "heat": {
-                    "username": "heat",
-                    "password": "heat"
-                },
-                "policy": {
-                    "username": "congress",
-                    "password": "congress"
-                }
-            }
-        }
-    },{
-       "security": {
-            "accordion_heading": "OpenStack Keystone User Credentials",
-            "category": "console_credentials",
-            "data_structure": "table",
-            "action": "true",
-            "modifiable_data": ["username", "password"],
-            "table_display_header": ["Service", "UserName", "Password", "Action"],
-            "config":{
-                "admin": {
-                    "username": "admin",
-                    "password": "admin"
-                },
-                "demo": {
-                    "username": "demo",
-                    "password": "demo"
-                },
-                "compute": {
-                    "username": "nova",
-                    "password": "nova"
-                },
-                "dashboard": {
-                    "username": "dashboard",
-                    "password": "dashboard"
-                },
-                "identity": {
-                    "username": "keystone",
-                    "password": "keystone"
-                },
-                "image": {
-                    "username": "glance",
-                    "password": "glance"
-                },
-                "metering": {
-                    "username": "ceilometer",
-                    "password": "ceilometer"
-                },
-                "alarming": {
-                    "username": "aodh",
-                    "password": "aodh"
-                },
-                "network": {
-                    "username": "quantum",
-                    "password": "quantum"
-                },
-                "object-store": {
-                    "username": "swift",
-                    "password": "swift"
-                },
-                "heat": {
-                   "username": "heat",
-                   "password": "heat"
-                },
-                "volume": {
-                    "username": "cinder",
-                    "password": "cinder"
-                }
-            }
-        }
-    }]
-}
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf
new file mode 100755
index 00000000..5771a645
--- /dev/null
+++ b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-ocata.conf
@@ -0,0 +1,124 @@
+ADAPTER = 'openstack_ocata'
+FLAVOR = 'HA-ansible-multinodes-ocata'
+CONFIG_MAPPING = {
+    "mapped_name": "flavor_config",
+    "mapped_children": [{
+        "security": {
+            "accordion_heading": "OpenStack Database and Queue Credentials",
+            "category": "service_credentials",
+            "data_structure": "table",
+            "action": "true",
+            "modifiable_data": ["username", "password"],
+            "table_display_header": ["Service", "UserName", "Password", "Action"],
+            "config": {
+                "rabbitmq": {
+                    "username": "guest",
+                    "password": "guest"
+                },
+                "compute": {
+                    "username": "nova",
+                    "password": "nova"
+                },
+                "dashboard": {
+                    "username": "dashboard",
+                    "password": "dashboard"
+                },
+                "identity": {
+                    "username": "keystone",
+                    "password": "keystone"
+                },
+                "image": {
+                    "username": "glance",
+                    "password": "glance"
+                },
+                "metering": {
+                    "username": "ceilometer",
+                    "password": "ceilometer"
+                },
+                "alarming": {
+                    "username": "aodh",
+                    "password": "aodh"
+                },
+                "network": {
+                    "username": "neutron",
+                    "password": "neutron"
+                },
+                "mysql": {
+                    "username": "root",
+                    "password": "root"
+                },
+                "volume": {
+                    "username": "cinder",
+                    "password": "cinder"
+                },
+                "heat": {
+                    "username": "heat",
+                    "password": "heat"
+                },
+                "policy": {
+                    "username": "congress",
+                    "password": "congress"
+                }
+            }
+        }
+    },{
+       "security": {
+            "accordion_heading": "OpenStack Keystone User Credentials",
+            "category": "console_credentials",
+            "data_structure": "table",
+            "action": "true",
+            "modifiable_data": ["username", "password"],
+            "table_display_header": ["Service", "UserName", "Password", "Action"],
+            "config":{
+                "admin": {
+                    "username": "admin",
+                    "password": "admin"
+                },
+                "demo": {
+                    "username": "demo",
+                    "password": "demo"
+                },
+                "compute": {
+                    "username": "nova",
+                    "password": "nova"
+                },
+                "dashboard": {
+                    "username": "dashboard",
+                    "password": "dashboard"
+                },
+                "identity": {
+                    "username": "keystone",
+                    "password": "keystone"
+                },
+                "image": {
+                    "username": "glance",
+                    "password": "glance"
+                },
+                "metering": {
+                    "username": "ceilometer",
+                    "password": "ceilometer"
+                },
+                "alarming": {
+                    "username": "aodh",
+                    "password": "aodh"
+                },
+                "network": {
+                    "username": "quantum",
+                    "password": "quantum"
+                },
+                "object-store": {
+                    "username": "swift",
+                    "password": "swift"
+                },
+                "heat": {
+                   "username": "heat",
+                   "password": "heat"
+                },
+                "volume": {
+                    "username": "cinder",
+                    "password": "cinder"
+                }
+            }
+        }
+    }]
+}
-- 
cgit 1.2.3-korg