You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/26 10:39:32 UTC
[incubator-dlab] branch DLAB-terraform updated: updated endpoint
parameters;
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 9243fde updated endpoint parameters;
9243fde is described below
commit 9243fde57414cc7463738cf400cfe3b6b9e41446
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Sep 26 13:39:23 2019 +0300
updated endpoint parameters;
---
.../terraform/bin/deploy/endpoint_fab.py | 34 +++++++++++++---------
infrastructure-provisioning/terraform/bin/dlab.py | 11 +++++++
2 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index da4d1da..b3323a6 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -222,6 +222,14 @@ def configure_supervisor_endpoint():
web_path = '{}/webapp'.format(args.dlab_path)
if not exists(conn, web_path):
conn.run('mkdir -p {}'.format(web_path))
+ if args.cloud_provider == 'aws':
+ interface = sudo('curl http://169.254.169.254/latest/meta-data/network/interfaces/macs/')
+ args.vpc_id = sudo('curl http://169.254.169.254/latest/meta-data/network/interfaces/macs/{}/'
+ 'vpc-id'.format(interface))
+ args.subnet_id = sudo('curl http://169.254.169.254/latest/meta-data/network/interfaces/macs/{}/'
+ 'subnet-id'.format(interface))
+ args.vpc2_id = args.vpc_id
+ args.subnet2_id = args.subnet_id
conn.sudo('sed -i "s|OS_USR|{}|g" {}/tmp/supervisor_svc.conf'
.format(args.os_user, args.dlab_path))
conn.sudo('sed -i "s|WEB_CONF|{}|g" {}/tmp/supervisor_svc.conf'
@@ -257,7 +265,7 @@ def configure_supervisor_endpoint():
# conn.sudo('sed -i "s|MONGO_PASSWORD|{}|g" {}provisioning.yml'
# .format(args.mongo_password, dlab_conf_dir))
conn.sudo('sed -i "s|CONF_OS|{}|g" {}provisioning.yml'
- .format(args.conf_os, dlab_conf_dir))
+ .format(args.env_os, dlab_conf_dir))
conn.sudo('sed -i "s|SERVICE_BASE_NAME|{}|g" {}provisioning.yml'
.format(args.service_base_name, dlab_conf_dir))
conn.sudo('sed -i "s|EDGE_INSTANCE_SIZE|{}|g" {}provisioning.yml'
@@ -271,7 +279,7 @@ def configure_supervisor_endpoint():
conn.sudo('sed -i "s|TAG_RESOURCE_ID|{}|g" {}provisioning.yml'
.format(args.tag_resource_id, dlab_conf_dir))
conn.sudo('sed -i "s|SG_IDS|{}|g" {}provisioning.yml'
- .format(args.sg_ids, dlab_conf_dir))
+ .format(args.ssn_k8s_sg_id, dlab_conf_dir))
conn.sudo('sed -i "s|SSN_INSTANCE_SIZE|{}|g" {}provisioning.yml'
.format(args.ssn_instance_size, dlab_conf_dir))
conn.sudo('sed -i "s|VPC2_ID|{}|g" {}provisioning.yml'
@@ -301,11 +309,11 @@ def configure_supervisor_endpoint():
conn.sudo('sed -i "s|LDAP_DN|{}|g" {}provisioning.yml'
.format(args.ldap_dn, dlab_conf_dir))
conn.sudo('sed -i "s|LDAP_OU|{}|g" {}provisioning.yml'
- .format(args.ldap_ou, dlab_conf_dir))
+ .format(args.ldap_users_group, dlab_conf_dir))
conn.sudo('sed -i "s|LDAP_USER_NAME|{}|g" {}provisioning.yml'
- .format(args.ldap_user_name, dlab_conf_dir))
+ .format(args.ldap_user, dlab_conf_dir))
conn.sudo('sed -i "s|LDAP_USER_PASSWORD|{}|g" {}provisioning.yml'
- .format(args.ldap_user_password, dlab_conf_dir))
+ .format(args.ldap_bind_creds, dlab_conf_dir))
conn.sudo('touch /home/{}/.ensure_dir/configure_supervisor_ensured'
.format(args.os_user))
except Exception as err:
@@ -479,15 +487,15 @@ def init_args():
parser.add_argument('--endpoint_keystore_password', type=str, default='')
parser.add_argument('--keycloak_client_secret', type=str, default='')
parser.add_argument('--branch_name', type=str, default='DLAB-terraform') # change default
- parser.add_argument('--conf_os', type=str, default='debian')
+ parser.add_argument('--env_os', type=str, default='debian')
parser.add_argument('--service_base_name', type=str, default='')
- parser.add_argument('--edge_instence_size', type=str, default='')
+ parser.add_argument('--edge_instence_size', type=str, default='t2.medium')
parser.add_argument('--subnet_id', type=str, default='')
parser.add_argument('--region', type=str, default='')
parser.add_argument('--zone', type=str, default='')
- parser.add_argument('--tag_resource_id', type=str, default='')
- parser.add_argument('--sg_ids', type=str, default='')
- parser.add_argument('--ssn_instance_size', type=str, default='')
+ parser.add_argument('--tag_resource_id', type=str, default='user:tag')
+ parser.add_argument('--ssn_k8s_sg_id', type=str, default='')
+ parser.add_argument('--ssn_instance_size', type=str, default='t2.large')
parser.add_argument('--vpc2_id', type=str, default='')
parser.add_argument('--subnet2_id', type=str, default='')
parser.add_argument('--conf_key_dir', type=str, default='/root/keys/', help='Should end by symbol /')
@@ -501,9 +509,9 @@ def init_args():
parser.add_argument('--gcp_project_id', type=str, default='')
parser.add_argument('--ldap_host', type=str, default='')
parser.add_argument('--ldap_dn', type=str, default='')
- parser.add_argument('--ldap_ou', type=str, default='')
- parser.add_argument('--ldap_user_name', type=str, default='')
- parser.add_argument('--ldap_user_password', type=str, default='')
+ parser.add_argument('--ldap_users_group', type=str, default='')
+ parser.add_argument('--ldap_user', type=str, default='')
+ parser.add_argument('--ldap_bind_creds', type=str, default='')
print(parser.parse_known_args())
args = parser.parse_known_args()[0]
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py b/infrastructure-provisioning/terraform/bin/dlab.py
index f985022..0aeb851 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -908,6 +908,7 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
.add_str('--ssn_subnet',
'ID of AWS Subnet if you already have subnet created.',
group='endpoint')
+ .add_str('--ssn_k8s_sg_id', 'ID of SSN SG.', group='endpoint')
.add_str('--subnet_cidr',
'CIDR for Subnet creation. Conflicts with subnet_id.',
default='172.31.0.0/24', group='endpoint')
@@ -934,6 +935,16 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
group='endpoint')
.add_str('--additional_tag', 'Additional tag.',
default='product:dlab', group='endpoint')
+ .add_str('--ldap_host', 'ldap host', required=True,
+ group='endpoint')
+ .add_str('--ldap_dn', 'ldap dn', required=True,
+ group='endpoint')
+ .add_str('--ldap_user', 'ldap user', required=True,
+ group='endpoint')
+ .add_str('--ldap_bind_creds', 'ldap bind creds', required=True,
+ group='endpoint')
+ .add_str('--ldap_users_group', 'ldap users group', required=True,
+ group='endpoint')
)
return params.build()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org