This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DLAB-1593 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 68e6b539e735db438a94f587302a86195c9f4379 Author: leonidfrolov <[email protected]> AuthorDate: Wed Mar 11 13:53:46 2020 +0200 [DLAB-1593]: changed sans for step ca in case domain name is specified --- .../src/general/scripts/aws/edge_configure.py | 2 ++ .../src/general/scripts/azure/edge_configure.py | 8 ++++---- .../src/general/scripts/gcp/edge_configure.py | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index 7606416..1bb1c79 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -117,6 +117,8 @@ if __name__ == "__main__": if os.environ['conf_stepcerts_enabled'] == 'true': edge_conf['step_cert_sans'] = ' --san {0} '.format(edge_conf['edge_private_ip']) if edge_conf['network_type'] == 'public': + if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ: + edge_conf['step_cert_sans'] += ' --san {}.{}'.format(edge_conf['project_name'], os.environ['conf_domain_name']) edge_conf['step_cert_sans'] += ' --san {0} --san {1}'.format( dlab.meta_lib.get_instance_hostname(edge_conf['tag_name'], edge_conf['instance_name']), edge_conf['edge_public_ip']) diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py index 262f4d0..ab5ae39 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py @@ -130,10 +130,10 @@ if __name__ == "__main__": edge_conf['step_cert_sans'] = ' --san {0} '.format(AzureMeta.get_private_ip_address( edge_conf['resource_group_name'], edge_conf['instance_name'])) if os.environ['conf_network_type'] == 'public': - edge_conf['step_cert_sans'] += ' --san {0} --san {1} '.format( - AzureMeta.get_instance_public_ip_address(edge_conf['resource_group_name'], - edge_conf['instance_name']), - edge_conf['instance_dns_name']) + if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ: + edge_conf['step_cert_sans'] += ' --san {}.{}'.format(edge_conf['project_name'], os.environ['conf_domain_name']) + edge_conf['step_cert_sans'] += ' --san {0} --san {1} '.format(AzureMeta.get_instance_public_ip_address( + edge_conf['resource_group_name'], edge_conf['instance_name']), edge_conf['instance_dns_name']) else: edge_conf['step_cert_sans'] = '' diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py index 1720c81..406451c 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py @@ -136,6 +136,9 @@ if __name__ == "__main__": edge_conf['step_cert_sans'] = ' --san {0} --san {1} --san {2}'.format(edge_conf['static_ip'], edge_conf['instance_hostname'], edge_conf['private_ip']) + if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ: + edge_conf['step_cert_sans'] += ' --san {}.{}'.format(edge_conf['project_name'], + os.environ['conf_domain_name']) else: edge_conf['step_cert_sans'] = '' --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
