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/01/28 09:43:49 UTC
[incubator-dlab] branch odahu-integration updated:
[odahu-integration] Changed input method for certificates for Odahu
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
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 1a33442 [odahu-integration] Changed input method for certificates for Odahu
1a33442 is described below
commit 1a3344250556977586492be1b88266d69c23ace2
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Tue Jan 28 11:43:32 2020 +0200
[odahu-integration] Changed input method for certificates for Odahu
---
infrastructure-provisioning/scripts/deploy_dlab.py | 1 +
infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py | 6 +++---
.../src/general/scripts/gcp/ssn_configure.py | 2 ++
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_dlab.py b/infrastructure-provisioning/scripts/deploy_dlab.py
index 03afac8..2121345 100644
--- a/infrastructure-provisioning/scripts/deploy_dlab.py
+++ b/infrastructure-provisioning/scripts/deploy_dlab.py
@@ -121,6 +121,7 @@ parser.add_argument('--resource_id', type=str, default='line_item_resource_id',
'dlab resource id tag')
parser.add_argument('--odahu_tls_crt', type=str, default='', help='TLS Certificate for Odahu cluster')
parser.add_argument('--odahu_tls_key', type=str, default='', help='TLS Key for Odahu cluster')
+parser.add_argument('--odahu_docker_private_repo', type=str, default='', help='Odahu private repository url')
parser.add_argument('--ldap_hostname', type=str, default='localhost', help='Ldap instance hostname')
parser.add_argument('--ldap_dn', type=str, default='dc=example,dc=com',
help='Ldap distinguished name')
diff --git a/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile b/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile
index ec6556c..231ff1d 100644
--- a/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile
@@ -19,7 +19,7 @@
#
# ******************************************************************************
-FROM nexus.ailifecycle.org:443/odahu/odahu-flow-automation:1.0.0-dev1575376304448
+FROM <ODAHU_REPO>
ARG OS
ARG SRC_PATH
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
index 56e37ac..bbdf11a 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/odahu_deploy.py
@@ -72,9 +72,9 @@ if __name__ == "__main__":
odahu_conf['istio_helm_repo'] = os.environ['odahu_istio_helm_repo']
odahu_conf['helm_repo'] = os.environ['odahu_helm_repo']
odahu_conf['k8s_version'] = os.environ['odahu_k8s_version']
- odahu_conf['oauth_oidc_issuer_url'] = os.environ['oauth_oidc_issuer_url']
- odahu_conf['oauth_client_id'] = os.environ['oauth_client_id']
- odahu_conf['oauth_client_secret'] = os.environ['oauth_client_secret']
+ odahu_conf['oauth_oidc_issuer_url'] = "{}realms/{}".format(os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'])
+ 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'] = secret
odahu_conf['odahu_infra_version'] = os.environ['odahu_infra_version']
odahu_conf['odahuflow_version'] = os.environ['odahu_odahuflow_version']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index cc4627a..b028b8d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -240,6 +240,8 @@ if __name__ == "__main__":
os.environ['conf_cloud_provider'], ssn_conf['region'])
try:
+ sudo("sed -i \'s|<ODAHU_REPO>|{}|g\' {}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
+ format(os.environ['odahu_docker_private_repo'], os.environ['ssn_dlab_path']))
local("~/scripts/{}.py {}".format('configure_docker', params))
except:
traceback.print_exc()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org