This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DLAB-1594-2 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9639c7c3820d0b29aceecb925851f46f33330eb6 Author: leonidfrolov <[email protected]> AuthorDate: Wed Jul 22 13:46:09 2020 +0300 [DLAB-1594]: added variables --- infrastructure-provisioning/scripts/deploy_dlab.py | 6 ++ .../src/general/conf/dlab.ini | 6 ++ .../src/general/scripts/aws/ssn_configure.py | 71 ++++++++++++++++++++++ .../src/general/scripts/azure/ssn_configure.py | 71 ++++++++++++++++++++++ .../src/general/scripts/gcp/ssn_configure.py | 71 ++++++++++++++++++++++ 5 files changed, 225 insertions(+) diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py index 40b1485..7abc83b 100644 --- a/infrastructure-provisioning/scripts/deploy_dlab.py +++ b/infrastructure-provisioning/scripts/deploy_dlab.py @@ -143,6 +143,12 @@ parser.add_argument('--conf_stepcerts_root_ca', type=str, default='', help='Step parser.add_argument('--conf_stepcerts_kid', type=str, default='', help='Step KID') parser.add_argument('--conf_stepcerts_kid_password', type=str, default='', help='Step KID password') parser.add_argument('--conf_stepcerts_ca_url', type=str, default='', help='Step CA URL') +parser.add_argument('--conf_letsencrypt_enabled', type=str, default='false', help='Enable or disable Let`s Encrypt certificates') +parser.add_argument('--conf_letsencrypt_domain_name', type=str, default='', help='Domain names to apply. ' + 'For multiple domains enter a comma separated list of domains as a parameter') +parser.add_argument('--conf_letsencrypt_email', type=str, default='', help='Email that will be entered during ' + 'certificate obtaining and can be user for urgent renewal and security notices. ' + 'Use comma to register multiple emails, e.g. [email protected],[email protected].') parser.add_argument('--action', required=True, type=str, default='', choices=['build', 'deploy', 'create', 'terminate'], help='Available options: build, deploy, create, terminate') args = parser.parse_args() diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini index 8ab5f9e..98b621d 100644 --- a/infrastructure-provisioning/src/general/conf/dlab.ini +++ b/infrastructure-provisioning/src/general/conf/dlab.ini @@ -77,6 +77,12 @@ stepcerts_enabled = false # stepcerts_kid_password = ### Step certificates CA URL # stepcerts_ca_url = +### Enable or disable Lets Encrypt certificates +letsencrypt_enabled = false +### Domain names to apply +# letsencrypt_domain_name = +### email address to use +# letsencrypt_email = ### Prefix of the private subnet private_subnet_prefix = 24 ### Range of subnets defined by user diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py index bb8c555..759c417 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py @@ -456,6 +456,62 @@ if __name__ == "__main__": 'key': 'STEP_CA_URL', 'value': os.environ['conf_stepcerts_ca_url'] }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': '' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': '' + }) + elif os.environ['conf_letsencrypt_enabled'] == 'true': + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': os.environ['conf_letsencrypt_enabled'] + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': os.environ['conf_letsencrypt_domain_name'] + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': os.environ['conf_letsencrypt_email'] + }) + cloud_params.append( + { + 'key': 'STEP_CERTS_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'STEP_ROOT_CA', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_KID_ID', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_KID_PASSWORD', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_CA_URL', + 'value': '' + }) else: cloud_params.append( { @@ -482,6 +538,21 @@ if __name__ == "__main__": 'key': 'STEP_CA_URL', 'value': '' }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': '' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': '' + }) logging.info('[CONFIGURE SSN INSTANCE UI]') print('[CONFIGURE SSN INSTANCE UI]') params = "--hostname {} " \ diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py index 4557c67..fa3f827 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py @@ -359,6 +359,62 @@ if __name__ == "__main__": 'key': 'STEP_CA_URL', 'value': os.environ['conf_stepcerts_ca_url'] }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': '' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': '' + }) + elif os.environ['conf_letsencrypt_enabled'] == 'true': + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': os.environ['conf_letsencrypt_enabled'] + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': os.environ['conf_letsencrypt_domain_name'] + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': os.environ['conf_letsencrypt_email'] + }) + cloud_params.append( + { + 'key': 'STEP_CERTS_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'STEP_ROOT_CA', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_KID_ID', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_KID_PASSWORD', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_CA_URL', + 'value': '' + }) else: cloud_params.append( { @@ -385,6 +441,21 @@ if __name__ == "__main__": 'key': 'STEP_CA_URL', 'value': '' }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': '' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': '' + }) if os.environ['azure_datalake_enable'] == 'false': cloud_params.append( diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py index dd622d2..62c0991 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py @@ -396,6 +396,62 @@ if __name__ == "__main__": 'key': 'STEP_CA_URL', 'value': os.environ['conf_stepcerts_ca_url'] }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': '' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': '' + }) + elif os.environ['conf_letsencrypt_enabled'] == 'true': + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': os.environ['conf_letsencrypt_enabled'] + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': os.environ['conf_letsencrypt_domain_name'] + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': os.environ['conf_letsencrypt_email'] + }) + cloud_params.append( + { + 'key': 'STEP_CERTS_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'STEP_ROOT_CA', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_KID_ID', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_KID_PASSWORD', + 'value': '' + }) + cloud_params.append( + { + 'key': 'STEP_CA_URL', + 'value': '' + }) else: cloud_params.append( { @@ -422,6 +478,21 @@ if __name__ == "__main__": 'key': 'STEP_CA_URL', 'value': '' }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_ENABLED', + 'value': 'false' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_DOMAIN_NAME', + 'value': '' + }) + cloud_params.append( + { + 'key': 'LETS_ENCRYPT_EMAIL', + 'value': '' + }) params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --billing_enabled {} " \ "--request_id {} --billing_dataset_name {} \ --resource {} --service_base_name {} --cloud_provider {} --default_endpoint_name {} " \ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
