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 1adefc3 fixed typo;
new df264ed Merge remote-tracking branch 'origin/DLAB-terraform' into
DLAB-terraform
1adefc3 is described below
commit 1adefc3f8f75aac204f9636f6999dfe81881b656
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Sep 5 15:32:47 2019 +0300
fixed typo;
---
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 6e2d2bb..b2d58db 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -400,7 +400,7 @@ if __name__ == "__main__":
},
{
'key': 'LDAP_HOST',
- 'value': os.environ['ldap_host']
+ 'value': os.environ['ldap_hostname']
},
{
'key': 'LDAP_DN',
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 0a12d43..1831241 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -257,7 +257,7 @@ if __name__ == "__main__":
},
{
'key': 'LDAP_HOST',
- 'value': os.environ['ldap_host']
+ 'value': os.environ['ldap_hostname']
},
{
'key': 'LDAP_DN',
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 80fd3a7..bd70272 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -320,7 +320,7 @@ if __name__ == "__main__":
},
{
'key': 'LDAP_HOST',
- 'value': os.environ['ldap_host']
+ 'value': os.environ['ldap_hostname']
},
{
'key': 'LDAP_DN',
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
b/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
index 91cf516..15e24f1 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_gitlab.py
@@ -87,7 +87,7 @@ def prepare_config():
else:
local('sed -i "s,EXTERNAL_URL,http://{},g"
gitlab.rb'.format(os.environ['instance_hostname']))
- local('sed -i "s/LDAP_HOST/{}/g"
gitlab.rb'.format(os.environ['ldap_host']))
+ local('sed -i "s/LDAP_HOST/{}/g"
gitlab.rb'.format(os.environ['ldap_hostname']))
local('sed -i "s/LDAP_PORT/{}/g"
gitlab.rb'.format(os.environ['ldap_port']))
local('sed -i "s/LDAP_UID/{}/g"
gitlab.rb'.format(os.environ['ldap_uid']))
local('sed -i "s/LDAP_BIND_DN/{}/g"
gitlab.rb'.format(os.environ['ldap_bind_dn']))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]