This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 4e73a98 [odahu-integration] Bugfix
new 3c2f0d0 Merge remote-tracking branch 'origin/odahu-integration' into
odahu-integration
4e73a98 is described below
commit 4e73a984f3c9f11ffe7b88e67ff3afbec969ac00
Author: Demyan Mysakovets <demian.mysakove...@gmail.com>
AuthorDate: Tue Mar 31 17:38:47 2020 +0300
[odahu-integration] Bugfix
---
.../src/general/scripts/gcp/odahu_deploy.py | 14 +++++++-------
.../src/general/scripts/gcp/odahu_resume.py | 14 +++++++-------
.../src/general/scripts/gcp/odahu_suspend.py | 14 +++++++-------
.../src/general/scripts/gcp/odahu_terminate.py | 14 +++++++-------
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 8ca6051..75c6917 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -225,7 +225,7 @@ if __name__ == "__main__":
"oauth_oidc_scope": "openid profile email offline_access
groups",
"oauth_oidc_token_endpoint":
"{}/protocol/openid-connect/token".format(odahu_conf['oauth_oidc_issuer_url']),
"odahu_automation_version":
"{}".format(odahu_conf['automation_version']),
- "odahu_infra_version":
"{}".format(odahu_conf['nfra_version']),
+ "odahu_infra_version":
"{}".format(odahu_conf['infra_version']),
"odahu_ui_version": "{}".format(odahu_conf['ui_version']),
"odahuflow_connection_decrypt_token":
"{}".format(odahu_conf['decrypt_token']),
"odahuflow_connections": [
@@ -248,23 +248,23 @@ if __name__ == "__main__":
"service_accounts": {
"airflow": {
"client_id": "sa-airflow",
- "client_secret":
"{}".format(odahu_conf['sa-airflow_secret'])
+ "client_secret":
"{}".format(odahu_conf['airflow_secret'])
},
"operator": {
"client_id": "sa-operator",
- "client_secret":
"{}".format(odahu_conf['sa-operator_secret'])
+ "client_secret":
"{}".format(odahu_conf['operator_secret'])
},
"resource_uploader": {
"client_id": "sa-resource-uploader",
- "client_secret":
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+ "client_secret":
"{}".format(odahu_conf['resource-uploader_secret'])
},
"test": {
"client_id": "sa-tester",
- "client_secret":
"{}".format(odahu_conf['sa-tester_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester_secret'])
},
"test_data_scientist": {
"client_id": "sa-tester-data-scientist",
- "client_secret":
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester-data-scientist_secret'])
}
},
"service_cidr": "{}".format(odahu_conf['service_cidr']),
@@ -275,7 +275,7 @@ if __name__ == "__main__":
"tls_key": "{}".format(odahu_conf['tls_key']),
"vpc_name": "{}".format(odahu_conf['vpc_name']),
"vault": {
- "enabled": true
+ "enabled": "true"
}
}
profile.write(json.dumps(prof))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index 39f5c23..e6fe634 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -228,7 +228,7 @@ if __name__ == "__main__":
"oauth_oidc_token_endpoint":
"{}/protocol/openid-connect/token".format(
odahu_conf['oauth_oidc_issuer_url']),
"odahu_automation_version":
"{}".format(odahu_conf['automation_version']),
- "odahu_infra_version": "{}".format(odahu_conf['nfra_version']),
+ "odahu_infra_version":
"{}".format(odahu_conf['infra_version']),
"odahu_ui_version": "{}".format(odahu_conf['ui_version']),
"odahuflow_connection_decrypt_token":
"{}".format(odahu_conf['decrypt_token']),
"odahuflow_connections": [
@@ -251,23 +251,23 @@ if __name__ == "__main__":
"service_accounts": {
"airflow": {
"client_id": "sa-airflow",
- "client_secret":
"{}".format(odahu_conf['sa-airflow_secret'])
+ "client_secret":
"{}".format(odahu_conf['airflow_secret'])
},
"operator": {
"client_id": "sa-operator",
- "client_secret":
"{}".format(odahu_conf['sa-operator_secret'])
+ "client_secret":
"{}".format(odahu_conf['operator_secret'])
},
"resource_uploader": {
"client_id": "sa-resource-uploader",
- "client_secret":
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+ "client_secret":
"{}".format(odahu_conf['resource-uploader_secret'])
},
"test": {
"client_id": "sa-tester",
- "client_secret":
"{}".format(odahu_conf['sa-tester_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester_secret'])
},
"test_data_scientist": {
"client_id": "sa-tester-data-scientist",
- "client_secret":
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester-data-scientist_secret'])
}
},
"service_cidr": "{}".format(odahu_conf['service_cidr']),
@@ -278,7 +278,7 @@ if __name__ == "__main__":
"tls_key": "{}".format(odahu_conf['tls_key']),
"vpc_name": "{}".format(odahu_conf['vpc_name']),
"vault": {
- "enabled": true
+ "enabled": "true"
}
}
profile.write(json.dumps(prof))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index b0945ad..c5a23f6 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
@@ -226,7 +226,7 @@ if __name__ == "__main__":
"oauth_oidc_token_endpoint":
"{}/protocol/openid-connect/token".format(
odahu_conf['oauth_oidc_issuer_url']),
"odahu_automation_version":
"{}".format(odahu_conf['automation_version']),
- "odahu_infra_version":
"{}".format(odahu_conf['nfra_version']),
+ "odahu_infra_version":
"{}".format(odahu_conf['infra_version']),
"odahu_ui_version": "{}".format(odahu_conf['ui_version']),
"odahuflow_connection_decrypt_token":
"{}".format(odahu_conf['decrypt_token']),
"odahuflow_connections": [
@@ -249,23 +249,23 @@ if __name__ == "__main__":
"service_accounts": {
"airflow": {
"client_id": "sa-airflow",
- "client_secret":
"{}".format(odahu_conf['sa-airflow_secret'])
+ "client_secret":
"{}".format(odahu_conf['airflow_secret'])
},
"operator": {
"client_id": "sa-operator",
- "client_secret":
"{}".format(odahu_conf['sa-operator_secret'])
+ "client_secret":
"{}".format(odahu_conf['operator_secret'])
},
"resource_uploader": {
"client_id": "sa-resource-uploader",
- "client_secret":
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+ "client_secret":
"{}".format(odahu_conf['resource-uploader_secret'])
},
"test": {
"client_id": "sa-tester",
- "client_secret":
"{}".format(odahu_conf['sa-tester_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester_secret'])
},
"test_data_scientist": {
"client_id": "sa-tester-data-scientist",
- "client_secret":
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester-data-scientist_secret'])
}
},
"service_cidr": "{}".format(odahu_conf['service_cidr']),
@@ -276,7 +276,7 @@ if __name__ == "__main__":
"tls_key": "{}".format(odahu_conf['tls_key']),
"vpc_name": "{}".format(odahu_conf['vpc_name']),
"vault": {
- "enabled": true
+ "enabled": "true"
}
}
profile.write(json.dumps(prof))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
index 751d4b2..4fa4686 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
@@ -227,7 +227,7 @@ if __name__ == "__main__":
"oauth_oidc_token_endpoint":
"{}/protocol/openid-connect/token".format(
odahu_conf['oauth_oidc_issuer_url']),
"odahu_automation_version":
"{}".format(odahu_conf['automation_version']),
- "odahu_infra_version": "{}".format(odahu_conf['nfra_version']),
+ "odahu_infra_version":
"{}".format(odahu_conf['infra_version']),
"odahu_ui_version": "{}".format(odahu_conf['ui_version']),
"odahuflow_connection_decrypt_token":
"{}".format(odahu_conf['decrypt_token']),
"odahuflow_connections": [
@@ -250,23 +250,23 @@ if __name__ == "__main__":
"service_accounts": {
"airflow": {
"client_id": "sa-airflow",
- "client_secret":
"{}".format(odahu_conf['sa-airflow_secret'])
+ "client_secret":
"{}".format(odahu_conf['airflow_secret'])
},
"operator": {
"client_id": "sa-operator",
- "client_secret":
"{}".format(odahu_conf['sa-operator_secret'])
+ "client_secret":
"{}".format(odahu_conf['operator_secret'])
},
"resource_uploader": {
"client_id": "sa-resource-uploader",
- "client_secret":
"{}".format(odahu_conf['sa-resource-uploader_secret'])
+ "client_secret":
"{}".format(odahu_conf['resource-uploader_secret'])
},
"test": {
"client_id": "sa-tester",
- "client_secret":
"{}".format(odahu_conf['sa-tester_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester_secret'])
},
"test_data_scientist": {
"client_id": "sa-tester-data-scientist",
- "client_secret":
"{}".format(odahu_conf['sa-tester-data-scientist_secret'])
+ "client_secret":
"{}".format(odahu_conf['tester-data-scientist_secret'])
}
},
"service_cidr": "{}".format(odahu_conf['service_cidr']),
@@ -277,7 +277,7 @@ if __name__ == "__main__":
"tls_key": "{}".format(odahu_conf['tls_key']),
"vpc_name": "{}".format(odahu_conf['vpc_name']),
"vault": {
- "enabled": true
+ "enabled": "true"
}
}
profile.write(json.dumps(prof))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
