You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/05/27 08:56:08 UTC

[incubator-dlab] branch DLAB-1835 updated: [DLAB-1835]: changed host resolving for keycloak, specified which arguments are required

This is an automated email from the ASF dual-hosted git repository.

lfrolov 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 67c9b91  [DLAB-1835]: changed host resolving for keycloak, specified which arguments are required
67c9b91 is described below

commit 67c9b91e8825d7e5fa5c004472bb3aa6533b8b4c
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed May 27 11:29:30 2020 +0300

    [DLAB-1835]: changed host resolving for keycloak, specified which arguments are required
---
 .../scripts/deploy_keycloak/deploy_keycloak.py             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py b/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py
index 9081062..8339991 100644
--- a/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py
+++ b/infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py
@@ -29,12 +29,12 @@ import os
 from fabric.contrib.files import exists
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--os_user', type=str, default='')
+parser.add_argument('--os_user', required=True, type=str, default='')
 parser.add_argument('--public_ip_address', type=str, default='')
-parser.add_argument('--keyfile', type=str, default='')
-parser.add_argument('--keycloak_realm_name', type=str, default='')
-parser.add_argument('--keycloak_user', type=str, default='')
-parser.add_argument('--keycloak_user_password', type=str, default='')
+parser.add_argument('--keyfile', required=True, type=str, default='')
+parser.add_argument('--keycloak_realm_name', required=True, type=str, default='')
+parser.add_argument('--keycloak_user', required=True, type=str, default='')
+parser.add_argument('--keycloak_user_password', required=True, type=str, default='')
 args = parser.parse_args()
 
 keycloak_version = "8.0.1"
@@ -45,9 +45,9 @@ private_ip_address = "127.0.0.1"
 
 def resolving_hosts(os_user):
     if not exists('/home/{}/.hosts_resolved'.format(os_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').replace('\n', ' ').split(' ')[-1:]
         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').replace('\n', ' ').split(' ')[-1:]
         sudo('echo "{} {} {}" >> /etc/hosts'.format(private_ip, host, host_short))
         sudo('touch /home/{}/.hosts_resolved'.format(os_user))
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org