You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2020/03/10 15:18:23 UTC
[incubator-dlab] 01/03: [odahu-integration] Added necessary
parameters in result.json
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
commit 4f2518838d4b62fe6307808de64f6005d49cb6d2
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Tue Mar 10 17:16:58 2020 +0200
[odahu-integration] Added necessary parameters in result.json
---
.../src/general/scripts/gcp/odahu_deploy.py | 4 ++++
.../src/general/scripts/gcp/odahu_resume.py | 4 ++--
.../src/general/scripts/gcp/odahu_suspend.py | 4 ++--
.../src/general/scripts/gcp/odahu_terminate.py | 8 ++++----
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index d01d7fd..7e32297 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -245,5 +245,9 @@ if __name__ == "__main__":
print('Odahu urls: {}'.format(odahu_urls))
res = dict()
res['odahu_urls'] = output['odahu_urls']['value']
+ res['oauth_cookie_secret'] = odahu_conf['oauth_cookie_secret']
+ res['odahuflow_connection_decrypt_token'] = odahu_conf['decrypt_token']
+ res['grafana_pass'] = odahu_conf['grafana_pass']
+ res['grafana_admin'] = odahu_conf['grafana_admin']
with open("/root/result.json", 'w') as result:
result.write(json.dumps(res))
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
index 8710495..849c08c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_resume.py
@@ -65,7 +65,7 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
odahu_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(odahu_conf['service_base_name'],
odahu_conf['project_name'])
- odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
+ odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
@@ -90,7 +90,7 @@ if __name__ == "__main__":
odahu_conf['tls_key'] = base64.b64decode(os.environ['odahu_tls_key'] + "==")
odahu_conf['ssh_key'] = os.environ['ssh_key']
odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
- odahu_conf['decrypt_token'] = os.environ['decrypt_token']
+ odahu_conf['decrypt_token'] = os.environ['odahuflow_connection_decrypt_token']
odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
print('Preparing parameters file')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
index b2f3894..96b3103 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_suspend.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
odahu_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(odahu_conf['service_base_name'],
odahu_conf['project_name'])
- odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
+ odahu_conf['grafana_admin'] = os.environ['grafana_admin']
odahu_conf['grafana_pass'] = os.environ['grafana_pass']
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
@@ -88,7 +88,7 @@ if __name__ == "__main__":
odahu_conf['tls_key'] = base64.b64decode(os.environ['odahu_tls_key'] + "==")
odahu_conf['ssh_key'] = os.environ['ssh_key']
odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
- odahu_conf['decrypt_token'] = os.environ['decrypt_token']
+ odahu_conf['decrypt_token'] = os.environ['odahuflow_connection_decrypt_token']
odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
print('Preparing parameters file')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
index 9b0f1f0..875e85c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_terminate.py
@@ -64,8 +64,8 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
odahu_conf['private_subnet_name'] = '{0}-{1}-subnet'.format(odahu_conf['service_base_name'],
odahu_conf['project_name'])
- odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
- odahu_conf['grafana_pass'] = id_generator()
+ odahu_conf['grafana_admin'] = os.environ['grafana_admin']
+ odahu_conf['grafana_pass'] = os.environ['grafana_pass']
odahu_conf['initial_node_count'] = os.environ['odahu_initial_node_count']
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
odahu_conf['helm_repo'] = os.environ['odahu_helm_repo']
@@ -75,7 +75,7 @@ if __name__ == "__main__":
odahu_conf['oauth_oidc_host'] = os.environ['odahu_oauth_oidc_host']
odahu_conf['oauth_client_id'] = os.environ['keycloak_client_name']
odahu_conf['oauth_client_secret'] = os.environ['keycloak_client_secret']
- odahu_conf['oauth_cookie_secret'] = base64.b64encode(id_generator(16))
+ odahu_conf['oauth_cookie_secret'] = os.environ['oauth_cookie_secret']
odahu_conf['odahu_infra_version'] = os.environ['odahu_infra_version']
odahu_conf['odahuflow_version'] = os.environ['odahu_odahuflow_version']
odahu_conf['mlflow_toolchain_version'] = os.environ['odahu_mlflow_toolchain_version']
@@ -89,7 +89,7 @@ if __name__ == "__main__":
odahu_conf['tls_key'] = base64.b64decode(os.environ['odahu_tls_key'] + "==")
odahu_conf['ssh_key'] = os.environ['ssh_key']
odahu_conf['dns_project_id'] = os.environ['odahu_dns_project_id']
- odahu_conf['decrypt_token'] = id_generator()
+ odahu_conf['decrypt_token'] = os.environ['odahuflow_connection_decrypt_token']
odahu_conf['infra_vpc_peering'] = os.environ['odahu_infra_vpc_peering']
print('Preparing parameters file')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org