Adds ability to deploy from upstream openstack

[apex.git] / apex / undercloud / undercloud.py

diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py
index 7efc2cb..5d73dd4 100644 (file)
--- a/apex/undercloud/undercloud.py
+++ b/apex/undercloud/undercloud.py
@@ -10,10 +10,12 @@
 import libvirt
 import logging
 import os
+import platform
 import shutil
+import subprocess
 import time
 
-from apex.virtual import virtual_utils as virt_utils
+from apex.virtual import utils as virt_utils
 from apex.virtual import configure_vm as vm_lib
 from apex.common import constants
 from apex.common import utils
@@ -27,13 +29,17 @@ class Undercloud:
     """
     This class represents an Apex Undercloud VM
     """
-    def __init__(self, image_path, root_pw=None, external_network=False):
+    def __init__(self, image_path, template_path,
+                 root_pw=None, external_network=False,
+                 image_name='undercloud.qcow2'):
         self.ip = None
         self.root_pw = root_pw
         self.external_net = external_network
         self.volume = os.path.join(constants.LIBVIRT_VOLUME_PATH,
                                    'undercloud.qcow2')
         self.image_path = image_path
+        self.image_name = image_name
+        self.template_path = template_path
         self.vm = None
         if Undercloud._get_vm():
             logging.error("Undercloud VM already exists.  Please clean "
@@ -54,13 +60,16 @@ class Undercloud:
         networks = ['admin']
         if self.external_net:
             networks.append('external')
+        console = 'ttyAMA0' if platform.machine() == 'aarch64' else 'ttyS0'
+
         self.vm = vm_lib.create_vm(name='undercloud',
                                    image=self.volume,
                                    baremetal_interfaces=networks,
                                    direct_boot='overcloud-full',
-                                   kernel_args=['console=ttyS0',
+                                   kernel_args=['console={}'.format(console),
                                                 'root=/dev/sda'],
-                                   default_network=True)
+                                   default_network=True,
+                                   template_dir=self.template_path)
         self.setup_volumes()
         self.inject_auth()
 
@@ -104,21 +113,37 @@ class Undercloud:
     def configure(self, net_settings, playbook, apex_temp_dir):
         """
         Configures undercloud VM
-        :return:
+        :param net_setings: Network settings for deployment
+        :param playbook: playbook to use to configure undercloud
+        :param apex_temp_dir: temporary apex directory to hold configs/logs
+        :return: None
         """
-        # TODO(trozet): If undercloud install fails we can add a retry
+
         logging.info("Configuring Undercloud...")
         # run ansible
         ansible_vars = Undercloud.generate_config(net_settings)
         ansible_vars['apex_temp_dir'] = apex_temp_dir
-        utils.run_ansible(ansible_vars, playbook, host=self.ip, user='stack')
+        try:
+            utils.run_ansible(ansible_vars, playbook, host=self.ip,
+                              user='stack')
+        except subprocess.CalledProcessError:
+            logging.error(
+                "Failed to install undercloud..."
+                "please check log: {}".format(os.path.join(
+                    apex_temp_dir, 'apex-undercloud-install.log')))
+            raise ApexUndercloudException('Failed to install undercloud')
         logging.info("Undercloud installed!")
 
     def setup_volumes(self):
         for img_file in ('overcloud-full.vmlinuz', 'overcloud-full.initrd',
-                         'undercloud.qcow2'):
+                         self.image_name):
             src_img = os.path.join(self.image_path, img_file)
-            dest_img = os.path.join(constants.LIBVIRT_VOLUME_PATH, img_file)
+            if img_file == self.image_name:
+                dest_img = os.path.join(constants.LIBVIRT_VOLUME_PATH,
+                                        'undercloud.qcow2')
+            else:
+                dest_img = os.path.join(constants.LIBVIRT_VOLUME_PATH,
+                                        img_file)
             if not os.path.isfile(src_img):
                 raise ApexUndercloudException(
                     "Required source file does not exist:{}".format(src_img))
@@ -129,7 +154,6 @@ class Undercloud:
         # TODO(trozet):check if resize needed right now size is 50gb
         # there is a lib called vminspect which has some dependencies and is
         # not yet available in pip.  Consider switching to this lib later.
-        # execute ansible playbook
 
     def inject_auth(self):
         virt_ops = list()
@@ -200,7 +224,7 @@ class Undercloud:
             "enabled": ns_external['enabled']
         }
 
-        # FIXME (trozet): for now hardcoding aarch64 to false
-        config['aarch64'] = False
+        # Check if this is an ARM deployment
+        config['aarch64'] = platform.machine() == 'aarch64'
 
         return config