Skip to content
This repository has been archived by the owner on Apr 23, 2024. It is now read-only.

Commit

Permalink
Fixed some issues with Windows builds after the inclusion of the IPv6…
Browse files Browse the repository at this point in the history 
… code
  • Loading branch information
@claytonpeters
claytonpeters committed Sep 27, 2019
1 parent bd8b700 commit 46d4e40
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion defaultcfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
PRJTASK_URL_FORMAT="http://localhost/pm_project_task/%s"

## Cortex internal version number
VERSION='5.2.0'
VERSION='5.2.1'

## Flask defaults (changed to what we prefer)
SESSION_COOKIE_SECURE = False
Expand Down
14 changes: 7 additions & 7 deletions workflows/buildvm/task.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def run(helper, options):
else:
gateway6 = None
if 'NETMASKS6' in options['wfconfig'] and options['network'] in options['wfconfig']['NETMASKS6']:
netmask6 = options['wfconfig']['NETMASKS6'][options['network']]
netmask6 = int(options['wfconfig']['NETMASKS6'][options['network']])
else:
netmask6 = None
dns_servers = options['wfconfig']['DNS_SERVERS']
Expand Down Expand Up @@ -111,7 +111,7 @@ def run(helper, options):
else:
gateway6 = None
if 'STU_NETMASKS6' in options['wfconfig'] and options['network'] in options['wfconfig']['STU_NETMASKS6']:
netmask6 = options['wfconfig']['STU_NETMASKS6'][options['network']]
netmask6 = int(options['wfconfig']['STU_NETMASKS6'][options['network']])
else:
netmask6 = None
network_name = options['wfconfig']['STU_NETWORK_NAMES'][options['network']]
Expand Down Expand Up @@ -215,16 +215,16 @@ def run(helper, options):
# Build a customisation spec depending on the environment to use the correct domain details
if workflow == 'standard':
if options['env'] == 'dev':
vm_spec = helper.lib.vmware_vm_custspec(dhcp=False, gateway=gateway, netmask=netmask, ipaddr=ipv4addr, dns_servers=dns_servers, dns_domain=dns_domain, os_type=os_type, os_domain='devdomain.soton.ac.uk', timezone=85, domain_join_user=helper.config['AD_DEV_JOIN_USER'], domain_join_pass=helper.config['AD_DEV_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=int(netmask6))
vm_spec = helper.lib.vmware_vm_custspec(dhcp=False, gateway=gateway, netmask=netmask, ipaddr=ipv4addr, dns_servers=dns_servers, dns_domain=dns_domain, os_type=os_type, os_domain='devdomain.soton.ac.uk', timezone=85, domain_join_user=helper.config['AD_DEV_JOIN_USER'], domain_join_pass=helper.config['AD_DEV_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=netmask6)
else:
vm_spec = helper.lib.vmware_vm_custspec(dhcp=False, gateway=gateway, netmask=netmask, ipaddr=ipv4addr, dns_servers=dns_servers, dns_domain=dns_domain, os_type=os_type, os_domain='soton.ac.uk', timezone=85, domain_join_user=helper.config['AD_PROD_JOIN_USER'], domain_join_pass=helper.config['AD_PROD_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=int(netmask6))
vm_spec = helper.lib.vmware_vm_custspec(dhcp=False, gateway=gateway, netmask=netmask, ipaddr=ipv4addr, dns_servers=dns_servers, dns_domain=dns_domain, os_type=os_type, os_domain='soton.ac.uk', timezone=85, domain_join_user=helper.config['AD_PROD_JOIN_USER'], domain_join_pass=helper.config['AD_PROD_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=netmask6)
elif workflow == 'sandbox':
if options['env'] == 'dev':
vm_spec = helper.lib.vmware_vm_custspec(dhcp=True, os_type=os_type, os_domain=win_dev_os_domain, timezone=85, domain_join_user=helper.config['AD_DEV_JOIN_USER'], domain_join_pass=helper.config['AD_DEV_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=int(netmask6))
vm_spec = helper.lib.vmware_vm_custspec(dhcp=True, os_type=os_type, os_domain=win_dev_os_domain, timezone=85, domain_join_user=helper.config['AD_DEV_JOIN_USER'], domain_join_pass=helper.config['AD_DEV_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name)
else:
vm_spec = helper.lib.vmware_vm_custspec(dhcp=True, os_type=os_type, os_domain=win_os_domain, timezone=85, domain_join_user=helper.config['AD_PROD_JOIN_USER'], domain_join_pass=helper.config['AD_PROD_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=int(netmask6))
vm_spec = helper.lib.vmware_vm_custspec(dhcp=True, os_type=os_type, os_domain=win_os_domain, timezone=85, domain_join_user=helper.config['AD_PROD_JOIN_USER'], domain_join_pass=helper.config['AD_PROD_JOIN_PASS'], fullname=win_full_name, orgname=win_org_name)
elif workflow == 'student':
vm_spec = helper.lib.vmware_vm_custspec(dhcp=False, gateway=gateway, netmask=netmask, ipaddr=ipv4addr, dns_servers=dns_servers, dns_domain=dns_domain, os_type=os_type, timezone=85, fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=int(netmask6))
vm_spec = helper.lib.vmware_vm_custspec(dhcp=False, gateway=gateway, netmask=netmask, ipaddr=ipv4addr, dns_servers=dns_servers, dns_domain=dns_domain, os_type=os_type, timezone=85, fullname=win_full_name, orgname=win_org_name, ipv6addr=ipv6addr, gateway6=gateway6, netmask6=netmask6)

# Anything else
else:
Expand Down

0 comments on commit 46d4e40

Please sign in to comment.