Fixes undercloud install failure with setting hostname

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

diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py
index feae43c..5ee487c 100644 (file)
--- a/apex/undercloud/undercloud.py
+++ b/apex/undercloud/undercloud.py
@@ -64,7 +64,7 @@ class Undercloud:
         if self.external_net:
             networks.append('external')
         console = 'ttyAMA0' if platform.machine() == 'aarch64' else 'ttyS0'
-        root = 'vda' if platform.machine() == 'aarch64' else 'sda'
+        root = 'vda2' if platform.machine() == 'aarch64' else 'sda'
 
         self.vm = vm_lib.create_vm(name='undercloud',
                                    image=self.volume,
@@ -112,7 +112,7 @@ class Undercloud:
             # give 10 seconds to come up
             time.sleep(10)
         # set IP
-        for x in range(5):
+        for x in range(10):
             if self._set_ip():
                 logging.info("Undercloud started.  IP Address: {}".format(
                     self.ip))
@@ -155,6 +155,8 @@ class Undercloud:
         ansible_vars['apex_temp_dir'] = apex_temp_dir
 
         ansible_vars['nat'] = self.detect_nat(net_settings)
+        ansible_vars['container_client'] = utils.find_container_client(
+            self.os_version)
         try:
             utils.run_ansible(ansible_vars, playbook, host=self.ip,
                               user='stack')
@@ -252,7 +254,8 @@ class Undercloud:
             "generate_service_certificate false",
             "undercloud_ntp_servers {}".format(str(ns['ntp'][0])),
             "container_images_file "
-            "/home/stack/containers-prepare-parameter.yaml"
+            "/home/stack/containers-prepare-parameter.yaml",
+            "undercloud_enable_selinux false"
         ]
 
         config['undercloud_network_config'] = [