This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1835
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1835 by this push:
new 33735c8 [DLAB-1835] - AWS private subnet CIDR parameter for deploy
added
33735c8 is described below
commit 33735c8ad9a2e945c5ce5e248c2f342c912316a7
Author: bodnarmykola <[email protected]>
AuthorDate: Thu Jun 11 11:04:26 2020 +0300
[DLAB-1835] - AWS private subnet CIDR parameter for deploy added
---
.../src/base/scripts/create_ssh_user.py | 12 ++++++++++--
.../src/general/scripts/aws/edge_configure.py | 17 +++++++++++------
.../src/general/scripts/aws/project_prepare.py | 8 +++-----
.../src/general/scripts/aws/rstudio_configure.py | 18 ++++++++++--------
.../project/scripts/configure_nginx_reverse_proxy.py | 3 ++-
5 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
b/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
index 5a866aa..f564227 100644
--- a/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
+++ b/infrastructure-provisioning/src/base/scripts/create_ssh_user.py
@@ -37,9 +37,17 @@ args = parser.parse_args()
def resolving_hosts(initial_user):
if not exists('/home/{}/.hosts_resolved'.format(initial_user)):
- host = sudo('curl
http://169.254.169.254/latest/meta-data/local-hostname').split('\n')[1]
+ host = sudo('curl
http://169.254.169.254/latest/meta-data/local-hostname').split('\n')
+ if len(host) > 1:
+ host = host[1]
+ else:
+ host = host[0]
host_short = host.split('.')[0]
- private_ip = sudo('curl
http://169.254.169.254/latest/meta-data/local-ipv4').split('\n')[1]
+ private_ip = sudo('curl
http://169.254.169.254/latest/meta-data/local-ipv4').split('\n')
+ if len(private_ip) > 1:
+ private_ip = private_ip[1]
+ else:
+ private_ip = private_ip[0]
sudo('echo "{} {} {}" >> /etc/hosts'.format(private_ip, host,
host_short))
sudo('touch /home/{}/.hosts_resolved'.format(initial_user))
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 68a473b..e725d3a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -221,12 +221,17 @@ if __name__ == "__main__":
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
edge_conf['keycloak_client_secret'] = str(uuid.uuid4())
- params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {}
--keycloak_client_secret {} " \
- "--step_cert_sans '{}' ".format(
- edge_conf['instance_private_ip'], edge_conf['keyfile_name'],
edge_conf['dlab_ssh_user'],
- '{}-{}-{}'.format(edge_conf['service_base_name'],
edge_conf['project_name'],
- edge_conf['endpoint_name']),
- edge_conf['keycloak_client_secret'],
edge_conf['step_cert_sans'])
+ params = "--instance_private_ip {} --hostname {} --keyfile {} --user
{} --keycloak_client_id {} \
+ --keycloak_client_secret {} --step_cert_sans '{}'
".format(edge_conf['instance_private_ip'],
+
edge_conf['instance_hostname'],
+
edge_conf['keyfile_name'],
+
edge_conf['dlab_ssh_user'],
+
'{}-{}-{}'.format(
+
edge_conf['service_base_name'],
+
edge_conf['project_name'],
+
edge_conf['endpoint_name']),
+
edge_conf['keycloak_client_secret'],
+
edge_conf['step_cert_sans'])
try:
local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy',
params))
except:
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 0523fbc..6d62d74 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -184,10 +184,6 @@ if __name__ == "__main__":
except KeyError:
project_conf['vpc2_id'] = project_conf['vpc_id']
- tag = {"Key": project_conf['tag_name'],
- "Value":
"{0}-{1}-{2}-subnet".format(project_conf['service_base_name'],
project_conf['project_name'],
- project_conf['endpoint_name'])}
-
if os.environ['aws_private_subnet_cidr']:
project_conf['private_subnet_cidr'] =
os.environ['aws_private_subnet_cidr']
else:
@@ -209,7 +205,9 @@ if __name__ == "__main__":
except Exception as err:
dlab.fab.append_result("Failed to create subnet.", str(err))
sys.exit(1)
-
+ tag = {"Key": project_conf['tag_name'],
+ "Value":
"{0}-{1}-{2}-subnet".format(project_conf['service_base_name'],
project_conf['project_name'],
+
project_conf['endpoint_name'])}
project_conf['private_subnet_cidr'] =
dlab.meta_lib.get_subnet_by_tag(tag)
except Exception as err:
dlab.fab.append_result("Failed to create subnet.", str(err))
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index dd2a93c..353f766 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -94,6 +94,8 @@ if __name__ == "__main__":
edge_instance_hostname =
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
edge_instance_name)
edge_instance_private_ip =
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
+ instance_private_ip =
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
+
notebook_config['instance_name']).get('Private')
notebook_config['edge_instance_hostname'] =
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
edge_instance_name)
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
@@ -115,7 +117,7 @@ if __name__ == "__main__":
logging.info('[CREATING DLAB SSH USER]')
print('[CREATING DLAB SSH USER]')
params = "--hostname {} --keyfile {} --initial_user {} --os_user {}
--sudo_group {}".format(
- instance_hostname, "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name']),
+ instance_private_ip, "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name']),
notebook_config['initial_user'], notebook_config['dlab_ssh_user'],
notebook_config['sudo_group'])
try:
@@ -134,7 +136,7 @@ if __name__ == "__main__":
print('[CONFIGURE PROXY ON R_STUDIO INSTANCE]')
additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
- .format(instance_hostname, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config),
+ .format(instance_private_ip, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
try:
local("~/scripts/{}.py {}".format('common_configure_proxy',
params))
@@ -151,7 +153,7 @@ if __name__ == "__main__":
logging.info('[INSTALLING PREREQUISITES TO R_STUDIO NOTEBOOK
INSTANCE]')
print('[INSTALLING PREREQUISITES TO R_STUDIO NOTEBOOK INSTANCE]')
params = "--hostname {} --keyfile {} --user {} --region {}
--edge_private_ip {}".\
- format(instance_hostname, keyfile_name,
notebook_config['dlab_ssh_user'], os.environ['aws_region'],
+ format(instance_private_ip, keyfile_name,
notebook_config['dlab_ssh_user'], os.environ['aws_region'],
edge_instance_private_ip)
try:
local("~/scripts/{}.py {}".format('install_prerequisites', params))
@@ -171,7 +173,7 @@ if __name__ == "__main__":
"--region {2} --rstudio_pass {3} " \
"--rstudio_version {4} --os_user {5} " \
"--r_mirror {6} --ip_address {7} --exploratory_name {8}
--edge_ip {9}" \
- .format(instance_hostname, keyfile_name,
+ .format(instance_private_ip, keyfile_name,
os.environ['aws_region'], notebook_config['rstudio_pass'],
os.environ['notebook_rstudio_version'],
notebook_config['dlab_ssh_user'],
os.environ['notebook_r_mirror'],
notebook_config['ip_address'],
@@ -192,7 +194,7 @@ if __name__ == "__main__":
additional_config = {"user_keyname": notebook_config['user_keyname'],
"user_keydir": os.environ['conf_key_dir']}
params = "--hostname {} --keyfile {} --additional_config '{}' --user
{}".format(
- instance_hostname, keyfile_name, json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
+ instance_private_ip, keyfile_name, json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
try:
local("~/scripts/{}.py {}".format('install_user_key', params))
except:
@@ -207,7 +209,7 @@ if __name__ == "__main__":
print('[SETUP USER GIT CREDENTIALS]')
logging.info('[SETUP USER GIT CREDENTIALS]')
params = '--os_user {} --notebook_ip {} --keyfile "{}"' \
- .format(notebook_config['dlab_ssh_user'], instance_hostname,
keyfile_name)
+ .format(notebook_config['dlab_ssh_user'], instance_private_ip,
keyfile_name)
try:
local("~/scripts/{}.py {}".format('manage_git_creds', params))
except:
@@ -223,7 +225,7 @@ if __name__ == "__main__":
print('[POST CONFIGURING PROCESS')
if notebook_config['notebook_image_name'] not in
[notebook_config['expected_image_name'], 'None']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {}
--nb_tag_value {}" \
- .format(instance_hostname, keyfile_name,
notebook_config['dlab_ssh_user'],
+ .format(instance_private_ip, keyfile_name,
notebook_config['dlab_ssh_user'],
notebook_config['tag_name'],
notebook_config['instance_name'])
try:
local("~/scripts/{}.py
{}".format('common_remove_remote_kernels', params))
@@ -243,7 +245,7 @@ if __name__ == "__main__":
'tensor': False
}
params = "--edge_hostname {} --keyfile {} --os_user {} --type {}
--exploratory_name {} --additional_info '{}'"\
- .format(edge_instance_hostname, keyfile_name,
notebook_config['dlab_ssh_user'], 'rstudio',
+ .format(instance_private_ip, keyfile_name,
notebook_config['dlab_ssh_user'], 'rstudio',
notebook_config['exploratory_name'],
json.dumps(additional_info))
try:
local("~/scripts/{}.py
{}".format('common_configure_reverse_proxy', params))
diff --git
a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
index a4f0825..c62fdaa 100644
---
a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
+++
b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
@@ -30,6 +30,7 @@ from dlab.common_lib import ensure_step
from dlab.edge_lib import install_nginx_lua
parser = argparse.ArgumentParser()
+parser.add_argument('--instance_private_ip', type=str, default='')
parser.add_argument('--hostname', type=str, default='')
parser.add_argument('--keyfile', type=str, default='')
parser.add_argument('--user', type=str, default='')
@@ -51,7 +52,7 @@ if __name__ == "__main__":
try:
env['connection_attempts'] = 100
env.key_filename = [args.keyfile]
- env.host_string = '{}@{}'.format(args.user, args.hostname)
+ env.host_string = '{}@{}'.format(args.user, args.instance_private_ip)
except Exception as err:
print("Failed establish connection. Excpeption: " + str(err))
sys.exit(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]