diff options
Diffstat (limited to 'apex/undercloud/undercloud.py')
| -rw-r--r-- | apex/undercloud/undercloud.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index d76174b0..d2de2de1 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -75,7 +75,6 @@ class Undercloud: template_dir=self.template_path) self.setup_volumes() self.inject_auth() - self._update_delorean_repo() @staticmethod def _get_ip(vm): @@ -125,6 +124,16 @@ class Undercloud: "Unable to find IP for undercloud. Check if VM booted " "correctly") + def detect_nat(self, net_settings): + if self.external_net: + net = net_settings['networks'][constants.EXTERNAL_NETWORK][0] + else: + net = net_settings['networks'][constants.ADMIN_NETWORK] + if net['gateway'] == net['installer_vm']['ip']: + return True + else: + return False + def configure(self, net_settings, deploy_settings, playbook, apex_temp_dir, virtual_oc=False): """ @@ -142,7 +151,8 @@ class Undercloud: ansible_vars = Undercloud.generate_config(net_settings, deploy_settings) ansible_vars['apex_temp_dir'] = apex_temp_dir - ansible_vars['virtual_overcloud'] = virtual_oc + + ansible_vars['nat'] = self.detect_nat(net_settings) try: utils.run_ansible(ansible_vars, playbook, host=self.ip, user='stack') @@ -228,7 +238,8 @@ class Undercloud: "network_cidr {}".format(str(ns_admin['cidr'])), "dhcp_start {}".format(str(ns_admin['dhcp_range'][0])), "dhcp_end {}".format(str(ns_admin['dhcp_range'][1])), - "inspection_iprange {}".format(','.join(intro_range)) + "inspection_iprange {}".format(','.join(intro_range)), + "generate_service_certificate false" ] config['ironic_config'] = [ |