This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 4e0bedf added step-ca
4e0bedf is described below
commit 4e0bedf454eb1cfcefd4b717e1e7e94da7f22947
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Dec 10 11:32:56 2019 +0200
added step-ca
---
.../src/general/scripts/aws/ssn_configure.py | 8 ++++++++
.../src/general/scripts/azure/ssn_configure.py | 8 ++++++++
.../terraform/aws/ssn-helm-charts/main/outputs.tf | 16 ++++++++++++++++
.../terraform/bin/deploy/endpoint_fab.py | 21 ++++++++++++++++++++-
.../gcp/ssn-gke/main/modules/helm_charts/outputs.tf | 4 ++++
.../terraform/gcp/ssn-gke/main/outputs.tf | 16 ++++++++++++++++
6 files changed, 72 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 0f82003..7d3a328 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -370,6 +370,14 @@ if __name__ == "__main__":
'value': os.environ['keycloak_client_secret']
},
{
+ 'key': 'KEYCLOAK_USER_NAME',
+ 'value': os.environ['keycloak_user']
+ },
+ {
+ 'key': 'KEYCLOAK_PASSWORD',
+ 'value': os.environ['keycloak_user_password']
+ },
+ {
'key': 'CONF_OS',
'value': os.environ['conf_os_family']
},
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 601aaaf..2faa7ed 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -230,6 +230,14 @@ if __name__ == "__main__":
'value': os.environ['keycloak_client_secret']
},
{
+ 'key': 'KEYCLOAK_USER_NAME',
+ 'value': os.environ['keycloak_user']
+ },
+ {
+ 'key': 'KEYCLOAK_PASSWORD',
+ 'value': os.environ['keycloak_user_password']
+ },
+ {
'key': 'CONF_OS',
'value': os.environ['conf_os_family']
},
diff --git
a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/outputs.tf
b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/outputs.tf
index 8181cdb..a0e6e10 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/outputs.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/outputs.tf
@@ -23,6 +23,22 @@ output "keycloak_client_secret" {
value = random_uuid.keycloak_client_secret.result
}
+output "keycloak_auth_server_url" {
+ value = "https://${local.ui_host}/auth";
+}
+
+output "keycloak_realm_name" {
+ value = "dlab"
+}
+
+output "keycloak_user_name" {
+ value = var.keycloak_user
+}
+
+output "keycloak_user_password" {
+ value = random_string.keycloak_password.result
+}
+
output "keycloak_client_id" {
value = "dlab-ui"
}
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 07e73b0..24f8be4 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -458,6 +458,22 @@ def
configure_supervisor_endpoint(endpoint_keystore_password):
{
'key': "CONF_IMAGE_ENABLED",
'value': args.image_enabled
+ },
+ {
+ 'key': "KEYCLOAK_AUTH_SERVER_URL",
+ 'value': args.keycloak_auth_server_url
+ },
+ {
+ 'key': "KEYCLOAK_REALM_NAME",
+ 'value': args.keycloak_realm_name
+ },
+ {
+ 'key': "KEYCLOAK_USER_NAME",
+ 'value': args.keycloak_user_name
+ },
+ {
+ 'key': "KEYCLOAK_PASSWORD",
+ 'value': args.keycloak_user_password
}
]
for param in cloud_properties:
@@ -672,7 +688,6 @@ def init_args():
parser.add_argument('--mongo_port', type=str, default='27017')
parser.add_argument('--ss_host', type=str, default='')
parser.add_argument('--ss_port', type=str, default='8443')
- parser.add_argument('--keycloack_host', type=str, default='')
parser.add_argument('--ssn_ui_host', type=str, default='')
# parser.add_argument('--mongo_password', type=str, default='')
parser.add_argument('--repository_address', type=str, default='')
@@ -682,6 +697,10 @@ def init_args():
parser.add_argument('--docker_version', type=str,
default='18.06.3~ce~3-0~ubuntu')
parser.add_argument('--ssn_bucket_name', type=str, default='')
+ parser.add_argument('--keycloak_auth_server_url', type=str, default='')
+ parser.add_argument('--keycloak_realm_name', type=str, default='')
+ parser.add_argument('--keycloak_user_name', type=str, default='')
+ parser.add_argument('--keycloak_user_password', type=str, default='')
parser.add_argument('--keycloak_client_id', type=str, default='')
parser.add_argument('--keycloak_client_secret', type=str, default='')
parser.add_argument('--branch_name', type=str, default='DLAB-terraform')
# change default
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
index a340b09..154527d 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/outputs.tf
@@ -27,6 +27,10 @@ output "keycloak_client_id" {
value = "dlab-ui"
}
+output "keycloak_user_password" {
+ value = random_string.keycloak_password.result
+}
+
output "ssn_ui_host" {
value = local.ui_host
}
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
index 3c89026..825f645 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/outputs.tf
@@ -57,4 +57,20 @@ output "step_kid_password" {
output "step_ca_url" {
value = module.helm_charts.step_ca_url
+}
+
+output "keycloak_auth_server_url" {
+ value = "https://${module.helm_charts.ssn_ui_host}/auth";
+}
+
+output "keycloak_realm_name" {
+ value = "dlab"
+}
+
+output "keycloak_user_name" {
+ value = var.keycloak_user
+}
+
+output "keycloak_user_password" {
+ value = module.helm_charts.keycloak_user_password
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
