This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-515-odahu
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f544365906d4f5463b3a5be47c00311612ab279d
Author: Demyan Mysakovets <demian.mysakove...@gmail.com>
AuthorDate: Mon May 4 11:35:42 2020 +0300
[odahu-integration] Bugfix
---
infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
b/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
index 1324b4b..ca53067 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/odahu_deploy.py
@@ -63,7 +63,7 @@ if __name__ == "__main__":
odahu_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
tag = {"Key": '{}-Tag'.format(odahu_conf['service_base_name']),
"Value": "{}-{}-subnet".format(odahu_conf['service_base_name'],
odahu_conf['project_name'])}
- odahu_conf['private_subnet_cidr'] = get_subnet_by_tag(tag)
+ odahu_conf['private_subnet_cidr'] = dlab.meta_lib.get_subnet_by_tag(tag)
odahu_conf['grafana_admin'] = os.environ['odahu_grafana_admin']
odahu_conf['grafana_pass'] = id_generator()
odahu_conf['docker_password'] =
base64.b64decode(os.environ['odahu_docker_password'] + "==")
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
index 72e38d4..d7b5358 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/odahu_prepare.py
@@ -48,8 +48,8 @@ if __name__ == "__main__":
odahu_conf['tag_name'] = '{}-tag'.format(odahu_conf['service_base_name'])
odahu_conf['endpoint_tag'] =
(os.environ['endpoint_name']).lower().replace('_', '-')
odahu_conf['project_tag'] =
(os.environ['project_name']).lower().replace('_', '-')
- odahu_conf['region'] = os.environ['gcp_region']
- odahu_conf['ssn_subnet_id'] = os.environ['ssn_subnet_id']
+ odahu_conf['region'] = os.environ['aws_region']
+ odahu_conf['ssn_subnet_id'] = os.environ['aws_subnet_id']
odahu_conf['bucket_name'] = "{}-tfstate".format(odahu_conf['cluster_name'])
odahu_conf['static_address_name'] =
"{}-nat-gw".format(odahu_conf['cluster_name'])
odahu_conf['keycloak_auth_server_url'] =
os.environ['keycloak_auth_server_url']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
