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>

1 files changed, 64 insertions, 18 deletions

diff --git a/deploy/client.py b/deploy/client.py
index a0d70644..433d90ec 100644
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -25,6 +25,7 @@ import requests
 import json
 import itertools
 import threading
+import multiprocessing
 from collections import defaultdict
 from restful import Client
 import log as logging
@@ -192,6 +193,12 @@ opts = [
     cfg.IntOpt('action_timeout',
                help='action timeout in seconds',
                default=60),
+    cfg.IntOpt('install_os_timeout',
+               help='OS install timeout in minutes',
+               default=60),
+    cfg.IntOpt('ansible_print_wait',
+               help='wait ansible-playbok ready',
+               default=5),
     cfg.IntOpt('deployment_timeout',
                help='deployment timeout in minutes',
                default=60),
@@ -883,7 +890,55 @@ class CompassClient(object):
 
         return status, cluster_state
 
-    def get_installing_progress(self, cluster_id):
+    def get_ansible_print(self):
+        def print_log(log):
+            try:
+                with open(log, 'r') as file:
+                    while True:
+                        line = file.readline()
+                        if not line:
+                            time.sleep(0.1)
+                            continue
+                        line = line.replace('\n', '')
+                        print line
+                        sys.stdout.flush()
+            except:
+                raise RuntimeError("open ansible.log error")
+
+        current_time = time.time()
+        install_timeout = current_time + 60 * CONF.install_os_timeout
+        while current_time < install_timeout:
+            ready = True
+            for id in self.host_mapping.values():
+                status, response = self.client.get_host_state(id)
+                if response['state'] != 'SUCCESSFUL':
+                    ready = False
+                break
+
+            current_time = time.time()
+            if not ready:
+                time.sleep(8)
+            else:
+                break
+
+        if current_time >= install_timeout:
+            raise RuntimeError("OS installation timeout")
+        else:
+            LOG.info("OS installation complete")
+
+        # time.sleep(CONF.ansible_start_wait)
+        compass_dir = os.getenv('COMPASS_DIR')
+        ansible_log = "%s/work/deploy/docker/ansible/run/%s-%s/ansible.log" \
+                      % (compass_dir, CONF.adapter_name, CONF.cluster_name)
+        os.system("sudo touch %s" % ansible_log)
+        os.system("sudo chmod +x -R %s/work/deploy/docker/ansible/run/"
+                  % compass_dir)
+        ansible_print = multiprocessing.Process(target=print_log,
+                                                args=(ansible_log,))
+        ansible_print.start()
+        return ansible_print
+
+    def get_installing_progress(self, cluster_id, ansible_print):
         def _get_installing_progress():
             """get intalling progress."""
             deployment_timeout = time.time() + 60 * float(CONF.deployment_timeout)  # noqa
@@ -905,23 +960,20 @@ class CompassClient(object):
                         (cluster_id, status, cluster_state)
                     )
 
-                time.sleep(5)
+                time.sleep(10)
 
             if current_time() >= deployment_timeout:
                 LOG.info("current_time=%s, deployment_timeout=%s"
                          % (current_time(), deployment_timeout))
                 LOG.info("cobbler status:")
-                os.system("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-                                 -i %s root@192.168.200.2 \
-                                 'cobbler status'" % (CONF.rsa_file))
+                os.system("sudo docker exec compass-cobbler bash -c \
+                          'cobbler status'" % (CONF.rsa_file))
                 raise RuntimeError("installation timeout")
 
         try:
             _get_installing_progress()
         finally:
-            # do this twice, make sure process be killed
-            kill_print_proc()
-            kill_print_proc()
+            ansible_print.terminate()
 
     def check_dashboard_links(self, cluster_id):
         dashboard_url = CONF.dashboard_url
@@ -946,17 +998,11 @@ class CompassClient(object):
 
 
 def print_ansible_log():
-    os.system("ssh -o StrictHostKeyChecking=no -o \
-              UserKnownHostsFile=/dev/null -i %s root@192.168.200.2 \
-              'while ! tail -f \
-              /var/ansible/run/%s-%s/ansible.log 2>/dev/null; do :; \
-              sleep 1; done'" %
-              (CONF.rsa_file, CONF.adapter_name, CONF.cluster_name))
+    pass
 
 
 def kill_print_proc():
-    os.system(
-        "ps aux|grep -v grep|grep -E 'ssh.+root@192.168.200.2'|awk '{print $2}'|xargs kill -9")   # noqa
+    pass
 
 
 def deploy():
@@ -981,8 +1027,8 @@ def deploy():
         client.deploy_clusters(cluster_id)
 
         LOG.info("compass OS installtion is begin")
-        threading.Thread(target=print_ansible_log).start()
-        client.get_installing_progress(cluster_id)
+        ansible_print = client.get_ansible_print()
+        client.get_installing_progress(cluster_id, ansible_print)
         client.check_dashboard_links(cluster_id)
 
     else: