diff options
author | Feng Pan <fpan@redhat.com> | 2018-05-31 17:32:27 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-05-31 17:32:27 +0000 |
commit | bd292a3c44dbe385974e4ee41dcb8149558f0be4 (patch) | |
tree | fa78d3e6943534b1338d257af5b8797e9dd9474c /apex/undercloud | |
parent | 4f53c4bfc09753c5b3e9d5762d691fc439087295 (diff) | |
parent | d0f4951e914cacd99c750cb04a332cd7251b9de8 (diff) |
Merge "Configure NAT with baremetal when necessary"
Diffstat (limited to 'apex/undercloud')
-rw-r--r-- | apex/undercloud/undercloud.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 3cd1e70f..d2de2de1 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -124,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): """ @@ -141,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') |